From 34f6bb67e99e6d76da86c12dbe326586c26efd7c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Usar etiquetes comodí"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
La seva pregunta no s'ha publicat ja que el vostre compte d'usuari no té suficients privilegis
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Acceptar la millor resposta d'aquesta pregunta:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Acceptar la millor resposta per aquestes preguntes:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "%(question_count)d pregunta actualitzada de %(topics)s" msgstr[1] "%(question_count)d preguntes actualitzades de %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3454,11 +3437,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "pregunta nova" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3481,86 +3464,86 @@ msgstr[1] "%(question_count)d preguntes sense contestar de %(topics)s"
msgid "Please log in to use %s"
msgstr "Entrar per usar %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "No pot acceptar o rebutjar les millors respostes ja que el seu compte està bloquejat"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "No pot acceptar o rebutjar les millors respostes ja que el seu compte està deshabilitat"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr "S'ha de tenir més de %(points)s per acceptar o rebutjar la pròpia resposta a la vostre pròpia pregunta"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Podrà acceptar aquesta resposta a partir de %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Només els moderadors o l'autor original de la pregunta -%(username)s- poden acceptar i rebutjar la millor resposta"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "El seu compte sembla que està bloquejat"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "El seu compte sembla que està deshabilitat"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "s'han de tenir més de %(points)s per votar positivament"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "s'han de tenir més de %(points)s per votar negativament"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Els usuaris bloquejats no poden penjar fitxers"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Els usuaris deshabilitats no poden penjar fitxers"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3571,57 +3554,57 @@ msgid_plural ""
msgstr[0] "Els comentaris (excepte el darrer) es poden editar durant %(minutes)s minut des de que es publiquen"
msgstr[1] "Els comentaris (excepte el darrer) es poden editar durant %(minutes)s minuts des de que es publiquen"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Només els propietaris de l'entrada o els moderadors poden editar comentaris"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "El seu compte està deshabilitat, només pot comentar les entrades pròpies"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Per comentar una entrada es cal tenir una reputació de %(min_rep)s puntsSí podeu comentar les entrades i les respostes a les vostres preguntes"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Aquesta entrada s'ha esborrat. Només els seus propietaris, l'administrador del lloc i els moderadors la poden veure."
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Una entrada esborrada només la poden editar els moderadors, els administradors del lloc o els propietaris de l'entrada."
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "El seu compte està bloquejat, no podeu editar entrades"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "El seu compte està deshabilitat, només pot editar entrades pròpies"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Per editar entrades wiki s'ha de tenir una reputació mínima de %(min_rep)s"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Per editar entrades d'altres persones s'ha de tenir una reputació mínima de %(min_rep)s"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3631,103 +3614,103 @@ msgid_plural ""
msgstr[0] "No es pot eliminar la pregunta ja que hi ha una resposta amb vots positius d'un altre usuari"
msgstr[1] "No es pot eliminar la pregunta ja que hi ha respostes d'altres usuaris amb vots positius"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "El seu compte està bloquejat, no pot eliminar entrades"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "El seu compte està deshabilitat, només pot eliminar entrades pròpies"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "El seu compte està bloquejat, no pot tancar preguntes"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Des de que el seu compte està deshabilitat no pot tancar preguntes"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Per tancar entrades d'altres persones cal tenir una reputació mínima de %(min_rep)s"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Per tancar una pregunta pròpia cal tenir una reputació mínima de %(min_rep)s"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Només els moderadors, els administradors del lloc o els propietaris de les entrades amb reputació mínim de %(min_rep)s poden reobrir preguntes."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Per reobrir una pregunta pròpia cal tenir una reputació mínima de %(min_rep)s"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3735,221 +3718,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "No té permís per treure totes les senyals"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Només els propietaris de de la pregunta, els moderadors i els administradors podenreetiquetar una pregunta esborrada"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "El seu compte està bloquejat, no pot reetiquetar preguntes"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "El seu compte està deshabilitat, només pot reetiquetar les preguntes pròpies"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Per reetiquetar una pregunta ha de tenir una reputació mínima de %(min_rep)s "
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "El seu compte està bloquejat, no pot eliminar un comentari"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "El seu compte està deshabilitat, només pot eliminar els comentaris pròpies"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Per eliminar comentaris ha de tenir una reputació mínima de %(min_rep)s"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "a %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "en dos dies"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "demà"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "en %(hr)d hora"
msgstr[1] "en %(hr)d hores"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "en %(min)d minut"
msgstr[1] "en %(min)d minuts"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d dia"
msgstr[1] "%(days)d dies"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Els usuaris nous han d'esperar %(days)s per respondre la seva pròpia pregunta. Podeu publicar una resposta %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anònim"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administrador del Lloc"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderador del Fòrum"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Usuari Deshabilitat"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Usuari Bloquejat"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Usuari Registrat"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Usuari Observat"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Usuari Habilitat"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s té una reputació de %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "una insígnia d'or"
msgstr[1] "%(count)d insígnies d'or"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "una insígnia de plata"
msgstr[1] "%(count)d insígnies de plata"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "una insígnia de bronze"
msgstr[1] "%(count)d insígnies de bronze"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s i %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s té %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Ha rebut una insígnia '%(badge_name)s'. Vegeu la perfil d'usuari."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "S'ha desat la seva subscripció d'etiquetes"
@@ -4219,49 +4202,57 @@ msgstr "Molt actiu en una etiqueta"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Aquesta pregunta s'ha esborrat i no es pot accedir"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "La resposat que cerca ja no es vàlida, ja què s'ha tret la pregunta original "
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Aquesta pregunta s'ha tret i no es pot accedir"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "El comentari que cerca ja no es pot accedir ja què s'ha tret la pregunta original"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "El comentari que cerca ja no es pot accedir ja què s'ha tret la resposta original"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4283,17 +4274,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4493,19 +4484,14 @@ msgstr "Editar resposta"
msgid "back"
msgstr "enrere"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revisió"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Guardar edició"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4513,21 +4499,21 @@ msgstr "Guardar edició"
msgid "Cancel"
msgstr "Cancel·lar"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "ocultar previsualització"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "mostrar previsualització"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4540,11 +4526,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4637,7 +4622,7 @@ msgstr "insígnia de plata: atorgada ocasionalment per contribucions de molta al
msgid "bronze badge: often given as a special honor"
msgstr "insígnia de bronze: atorgada sovint com un honor especial"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5122,61 +5107,61 @@ msgstr "nombre actual de vots"
msgid "anonymous user"
msgstr "usuari anònim"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "preguntat"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "respost"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "publicat"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "aquesta entrada està marcaa com a wiki comunitari"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Aquesta entrada és un wiki.\n Qualsevol amb una reputació de més de %(wiki_min_rep)s pot contribuir"
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "actualitzat"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "veure preguntes etiquetades '%(tag)s'"
@@ -5185,87 +5170,87 @@ msgstr "veure preguntes etiquetades '%(tag)s'"
msgid "delete this comment"
msgstr "eliminar aquest comentari"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "editar"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "seguir a %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "no seguir a %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "seguint a %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "imatge gravatar de %(username)s"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "el lloc web de %(username)s és %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "anterior"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "pàgina actual"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "pàgina següent"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "respostes per a %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "no hi ha respostes"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s entrades senyalades noves i %(seen)s anteriors"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s noves entrades senyalades"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s entrades senyalades"
@@ -5274,23 +5259,23 @@ msgstr "%(seen)s entrades senyalades"
msgid "Questions"
msgstr "Preguntes"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Respon la teva pròpia pregunta"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5298,7 +5283,15 @@ msgstr ""
msgid "Edit question"
msgstr "Editar pregunta"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5382,66 +5375,66 @@ msgstr "Subscriure"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Usuaris"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Ordenar per »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "veure les persones amb la reputació més alta"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "reputació"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "veure les persones que s'han afegit recentment"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "recent"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "veure les primeres persones que es van afegir al lloc"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "veure la gent ordenada per nom"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "per nom d'usuari"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "No s'ha trobat."
@@ -5462,97 +5455,29 @@ msgid "Sign in"
msgstr "Entrar"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Canviar la vostra adreça de correu electrònic"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Canviar correu electrònic"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Validar correu electrònic"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "No s'ha canviat el correu electrònic"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Correu electrònic canviat"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Correu electrònic verificat"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5561,19 +5486,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Registre"
@@ -5744,7 +5656,7 @@ msgid "Login or email"
msgstr "Usuari o correu electrònic"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Contrasenya"
@@ -5763,6 +5675,12 @@ msgstr "Contrasenya nova"
msgid "Please, retype"
msgstr "torni a escriure"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Canviar contrasenya"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6068,7 +5986,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6091,22 +6009,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6135,10 +6061,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6153,10 +6075,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6245,7 +6163,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Llocs"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "corregir l'error següent"
+msgstr[1] "corregir els errors següents"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Configuracions incloses a %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "No té permís per editar valors"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentació"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Sortir"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Inici"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Editar paràmetres del lloc"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Livesettings estan deshabilitats per aquest lloc"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Totes les opcions de configuració s'han d'editar en el fitxer settings.py del lloc. "
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Configuracions del grup: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Desplegar tot"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6333,8 +6309,8 @@ msgid "Did not find what you were looking for?"
msgstr "No has trobat el que buscaves?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Fes la teva pregunta"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6380,7 +6356,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "usar fins a %(tag_count)s etiquetes, de menys de %(max_chars)s caràcters cada una"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6743,7 +6719,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6878,6 +6854,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6989,24 +6994,24 @@ msgstr "últim cop vist"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "ubicació"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "edat"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "vots sense usar avui"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "vots restants"
@@ -7104,20 +7109,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] "Seguit per %(count)s person"
msgstr[1] "Seguit per %(count)s persones"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "Seguint %(count)s person"
msgstr[1] "Seguint %(count)s persones"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "La sev xarxa està buida. Voleu seguir algú?Només heu de visitar la seva pàgina de configuració i clicar \"seguir\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "la xarxa de %(username)s's és buida"
@@ -7217,7 +7222,7 @@ msgstr "Respon a:"
msgid "User profile"
msgstr "Perfil d'usuari"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "comentaris i respostes a altres preguntes"
@@ -7233,7 +7238,7 @@ msgstr ""
msgid "questions that user is following"
msgstr "preguntes que l'usuari segueix"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "registre de vots de l'usuari"
@@ -7242,11 +7247,11 @@ msgstr "registre de vots de l'usuari"
msgid "votes"
msgstr "vots"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "configuració de la subscripció de correu electrònic"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "moderar aquest usuari"
@@ -7267,7 +7272,15 @@ msgstr "procureu donar una resposta, sense entrar en un discussió"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7275,23 +7288,23 @@ msgstr ""
msgid "Contributors"
msgstr "Col·laboradors"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(requerit)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Commutar el previsualitzador de l'editor Markdown"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7562,23 +7575,23 @@ msgstr "configuració"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "hi ha hagut un error"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Entrar per publicar"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "S'ha detectar spam en el seu missatge, ho sentin si això és un error"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7642,38 +7655,38 @@ msgstr "aquesta adreça de correu ja s'està utilitzant, trieu un altre"
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "la contrasenya és necessaria"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "tornar a entrar la contrasenya"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "les contrasenyes no coincideixen, torneu a provar"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "fa 2 dies"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "ahir"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7732,46 +7745,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "freqüencia d'actualització de correus diària"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Registrar-se per votar"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7800,113 +7817,113 @@ msgstr ""
msgid "Privacy policy"
msgstr "Avís legal"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "el commentari que busca s'ha esborrat i no es pot accedir"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "usuari moderador"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "perfil d'usuari"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "resum perfil usuari"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "activitat recent de l'usuari"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "perfil - activitat recent"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "perfil - respostes"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "peril - vots"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "preguntes preferides dels usuaris"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "perfil - preguntes preferides"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "canvis desats"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "cancel·lat l'acutalització de correu electrònic"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "perfil - subscripcions de correu electrònic"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Els usuaris anònims no poden pujar fitxers"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "els tipus de fitxers permesos són '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "grandària màxima dels fitxers a penjar és de %(file_size)s"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Error penjant el fitxer. Contacteu amb l'administrador del lloc. Gràcies."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7915,45 +7932,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Entrar per respondre preguntes"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Sembla que heu sortit i no podeu posar comentaris. Entreu."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Els usuaris anònims no poden editar comentaris"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Sembla que heu sortit i no podeu eliminar comentaris. Entreu."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "sembla que tenim algunes dificultats tècniques"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/ca/LC_MESSAGES/djangojs.po b/askbot/locale/ca/LC_MESSAGES/djangojs.po
index 1820931f..f65224fb 100644
--- a/askbot/locale/ca/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/ca/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Títol de la pregunta (més de 10 caràcters)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -495,202 +499,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "clicar per tancar"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -753,7 +761,7 @@ msgstr "barra horitzontal"
msgid "undo"
msgstr "desfer"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "refer"
@@ -769,15 +777,15 @@ msgstr "entrar l'url"
msgid "upload file attachment"
msgstr "pujar arxiu adjunt"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/cs_CZ/LC_MESSAGES/django.po b/askbot/locale/cs_CZ/LC_MESSAGES/django.po
index 5feb0f64..7d8dd8e7 100644
--- a/askbot/locale/cs_CZ/LC_MESSAGES/django.po
+++ b/askbot/locale/cs_CZ/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Pozor: po zaškrtnutí prosím zazálohujte databázi a spusťte kontrolní příkaz: python manage.py fix_question_tags
pro globální přejmenování štítků"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Formát seznamu štítků"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Zvolte formát zobrazení štítků buď v seznamu nebo oblaku štítků"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Použít všeobecné štítky"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Všeobecné štítky mohou být použity ke sledování nebo vypnutí sledování naráz, validní všeobecný štítek má jediný všeobecný štítek zcela na konci"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Výchozí maximální počet zobrazených komentářů pod příspěvky"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Maximální délka komentáře musí být < %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Omezit časový limit pro editaci komentářů"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Pokud nezatrženo, pak nebude žádný časový limit pro editaci komentářů"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Minuty přípustné pro úpravu komentáře"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Pro umožnění tohoto nastavení, zatrhněte předcházející"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Promiňte, vaše otázka nemohla být uložena v důsledku nedostatečných práv vašeho uživatelského účtu
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Odsouhlasit nejlepší odpověď pro %(question_count)d ze svých otázek" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Prosím odsouhlaste nejlepší odpověď pro tuto otázku:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Prosím, odsouhlaste nejlepší odpověď pro tyto otázky:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" @@ -3450,7 +3432,7 @@ msgstr[0] "%(question_count)d aktualizovaná otázka k tématu %(topics)s" msgstr[1] "%(question_count)d aktualizovaných otázek k tématu %(topics)s" msgstr[2] "%(question_count)d aktualizovaných otázek k tématu %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3462,11 +3444,11 @@ msgstr[0] "
Vážený/á %(name)s,
Následující otázka byla aktualizo msgstr[1] "
Vážený/á %(name)s,
Následující %(num)d otázky byly aktualizovány na %(sitename)s:
" msgstr[2] "Vážený/á %(name)s,
Následujících %(num)d otázek bylo aktualizováno na %(sitename)s:
" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "nová otázka" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3490,86 +3472,86 @@ msgstr[2] "%(question_count)d nezodpovězených otázek k tématu %(topics)s"
msgid "Please log in to use %s"
msgstr "Prosím přihlašte se pro použití %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Promiňte, nemůžete odsouhlasit či zamítnout nejlepší odpovědi, protože váš účet je zablokován."
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Promiňte, nemůžete odsouhlasit či zamítnout nejlepší odpovědi, protože váš účet je pozastaven."
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ">%(points)s bodů je třeba k odsouhlasení či zamítnutí vlastní odpovědi k vlastní otázce"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Promiňte,žete odsouhlasit tuto odpověď až po %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Promiňte, pouze moderátoři nebo původní autoři otázky - %(username)s - mohou odsouhlasit nebo zamítnout nejlepší odpověď"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr "Promiňte, nemůžete hlasovat pro vlastní příspěvek"
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Promiňte, váš účet je zřejmě zablokován"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Promiňte, váš účet je zřejmě pozastaven"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ">%(points)s bodů je třeba k hlasování kladně"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s bodů je třeba k hlasování záporně"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Promiňte, zablokovaní uživatelé nemohou nahrávat soubory"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Promiňte, pozastavení uživatelé nemohou nahrávat soubory"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr "promiňte, nahrávání souborů vyžaduje vlivnost >%(min_rep)s"
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3581,57 +3563,57 @@ msgstr[0] "Promiňte, komentáře (kromě toho posledního) lze upravit až za %
msgstr[1] "Promiňte, komentáře (kromě toho posledního) lze upravit až za %(minutes)s minut od odeslání"
msgstr[2] "Promiňte, komentáře (kromě toho posledního) lze upravit až za %(minutes)s minut od odeslání"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Promiňte, ale pouze vlastníci příspěvků nebo moderátoři mohou upravovat komentáře"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Promiňte, protože váš účet je pozastaven, můžete komentovat pouze své vlastní příspěvky"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Promiňte, pro komentování kteréhokoliv příspěvku je třeba minimálně %(min_rep)s bodů. Můžete ovšem komentovat své vlastní příspěvky a odpovědi k vašim otázkám"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Tento příspěvek byl smazán a může být zobrazen pouze vlastníkům příspěvků, administrátorům webu a moderátorům"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Promiňte, pouze moderátoři, administrátoři webu a vlastníci příspěvků mohou upravovat příspěvky"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Promiňte, protože váš účet je zablokován, nemůžete upravovat příspěvky"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Promiňte, protože váš účet je pozastaven, můžete upravovat pouze své vlastní příspěvky"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Promiňte, k editaci wiki příspěvků je vyžadována minimálně %(min_rep)s reputace"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Promiňte, k úpravě příspěvků ostatních je vyžadována nejméně %(min_rep)s reputace."
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3642,103 +3624,103 @@ msgstr[0] "Promiňte, nelze smazat vaši otázku, protože obsahuje kladně ohod
msgstr[1] "Promiňte, nelze smazat vaše otázky, protože obsahují kladně ohodnocenéu odpovědi zaslané někým jiným"
msgstr[2] "Promiňte, nelze smazat vaše otázky, protože obsahují kladně ohodnocenéu odpovědi zaslané někým jiným"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Promiňte, protože váš účet je zablokován, nemůžete mazat příspěvky"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Promiňte, protože váš účet je pozastaven, můžete smazat pouze své vlastní příspěvky"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Promiňte, protože váš účet je zablokován, nemůžete uzavřít vlastní otázky"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Promiňte, protože váš účet je pozastaven, nemůžete uzavřít vlastní otázky"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Promiňte, k zavření příspěvků ostatních je vyžadována nejméně %(min_rep)s reputace"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Promiňte, k zavření vlastní otázky je vyžadována nejméně %(min_rep)s reputace"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Promiňte, pouze administrátoři, moderátoři a vlastníci příspěvků s reputací minimálně %(min_rep)s mohou znovuotevřít otázky."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Promiňte, pro znovuotevření vlastní otázky je vyžadována minimálně %(min_rep)s reputace"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr "Již jste označil tuto otázku dříve a to nelze více než jednou"
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr "Promiňte, protože váš účet je zablokován, nemůlžete označit příspěvek za útočný"
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr "Promiňte, pro označení příspěvku jako útočného je vyžadována nejméně %(min_rep)s reputace"
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr "Promiňte, vyčerpal jste maximální počet %(max_flags_per_day)s označení pro útočné na den."
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "Nelze odebrat neexistující značku"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr "Promiňte, protože je váš účet zablokován, nemůžete odstranit značky"
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr "Promiňte, váš účet je zřejmě pozastavený a nemůžete odebrat značky. Kontaktujte prosím administrátora fóra pro vyřešení situace."
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3747,67 +3729,67 @@ msgstr[0] "Promiňte, pro označení příspěvků je vyžadována nejméně %(m
msgstr[1] "Promiňte, pro označení příspěvků je vyžadována nejméně %(min_rep)d reputace"
msgstr[2] "Promiňte, pro označení příspěvků je vyžadována nejméně %(min_rep)d reputace"
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "nemáte oprávnění odstranit všechny značky"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "žádné značky pro tento záznam"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Promiňte, pouze vlastníci otázek, administrátoři webu a moderátoři mohou přeštítkovat smazané otázky"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Promiňte, protože váš účet je zablokován, nemůžete přeštítkovat otázky"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Promiňte, protože váš účet je pozastaven, můžete přeštítkovat pouze vlastní otázky"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Promiňte, pro přeštítkování otázek je vyžadována minimálně %(min_rep)s reputace"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Promiňte, protože váš účet je zablokován, nemůžete mazat komentáře"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Promiňte, protože váš účet je pozastaven, můžete mazat pouze vlastní komentáře"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Promiňte, pro mazání komentářů je vyžadována %(min_rep)s reputace "
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr "promiňte, ale starší hlasy nemohou být odvolány"
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "dne %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "za dva dny"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "zítra"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
@@ -3815,7 +3797,7 @@ msgstr[0] "za %(hr)d hodinu"
msgstr[1] "za %(hr)d hodiny"
msgstr[2] "za %(hr)d hodiny"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
@@ -3823,7 +3805,7 @@ msgstr[0] "za %(min)d minutu"
msgstr[1] "za %(min)d minuty"
msgstr[2] "za %(min)d minuty"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
@@ -3831,51 +3813,51 @@ msgstr[0] "%(days)d den"
msgstr[1] "%(days)d dní"
msgstr[2] "%(days)d dní"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Noví uživatelé musí vyčkat %(days)s před zodpovězením svých otázek. Můžete odeslat odpověď %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anonymní"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administrátor webu"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderátor fóra"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Vyloučený uživatel"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Zablokovaný uživatel"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Registrovaný uživatel"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Sledovaný uživatel"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Schválený uživatel"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s vlivnost je %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
@@ -3883,7 +3865,7 @@ msgstr[0] "jeden zlatý odznáček"
msgstr[1] "%(count)d zlatých odznáčků"
msgstr[2] "%(count)d zlatých odznáčků"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
@@ -3891,7 +3873,7 @@ msgstr[0] "jeden stříbrný odznáček"
msgstr[1] "%(count)d stříbrných odznáčků"
msgstr[2] "%(count)d stříbrných odznáčků"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
@@ -3899,17 +3881,17 @@ msgstr[0] "jeden bronzový odznáček"
msgstr[1] "%(count)d bronzových odznáčků"
msgstr[2] "%(count)d bronzových odznáčků"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s a %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s má %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
@@ -3917,58 +3899,58 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Blahopřejeme, právě jste obdržel odznáček '%(badge_name)s'. Zkontrolujte svůj profil"
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Vaše přidělení štítku bylo uloženo, děkujeme!"
@@ -4238,49 +4220,57 @@ msgstr "Velmi aktivní v jednom štítku"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Promiňte, tato otázka byla smazána a již není přístupná"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Promiňte, odpověď, kterou hledáte již není dostupná, protože nadřazená otázka byla odstraněna"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Promiňte, tato odpověď byla odstraněna a již není přístupná"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Promiňte, hledaný komentář již není přístupný, protože nadřazená otázka byla odstraněna"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "Promiňte, hledaný komentář již není přístupný, protože nadřazená odpověď byla odstraněna"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4303,17 +4293,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4513,19 +4503,14 @@ msgstr "Upravit odpověď"
msgid "back"
msgstr "zpět"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "úprava"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Uložit úpravu"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4533,21 +4518,21 @@ msgstr "Uložit úpravu"
msgid "Cancel"
msgstr "Zrušit"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "skrýt náhled"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "zobrazit náhled"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr "Zeptejte se"
@@ -4560,11 +4545,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4658,7 +4642,7 @@ msgstr "stříbrný odznak: příležitostně udělený za příspěvky ve vysok
msgid "bronze badge: often given as a special honor"
msgstr "bronzový odznak: často udělený za zvláštní přínos"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5143,61 +5127,61 @@ msgstr "současný počet hlasů"
msgid "anonymous user"
msgstr "anonymní uživatel"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "položené"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "zodpovězené"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "odeslané"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "tento příspěvek je označen jako společná wiki"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Tento příspěvek je wiki.\nKaždý s vlivností >%(wiki_min_rep)s je vítán, aby jej vylepšil."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "aktualizované"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "prohlédnout otázky se štítky '%(tag)s'"
@@ -5206,66 +5190,66 @@ msgstr "prohlédnout otázky se štítky '%(tag)s'"
msgid "delete this comment"
msgstr "smazat tento komentář"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "editovat"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "sledovat %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "nesledovat %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "sledovaní %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s gravatar obrázek"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "%(username)s stránky jsou %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "předchozí"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "tato stránka"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "stránka %(num)s"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "další stránka"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "odpovědi pro %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
@@ -5273,21 +5257,21 @@ msgstr[0] "máte %(response_count)s novou odpověď"
msgstr[1] "máte %(response_count)s nové odpovědi"
msgstr[2] "máte %(response_count)s nové odpovědi"
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "ještě žádné nové odpovědi"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s nově označené příspěvky a %(seen)s předchozí"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s nově označené příspěvky"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s označené příspěvky"
@@ -5296,23 +5280,23 @@ msgstr "%(seen)s označené příspěvky"
msgid "Questions"
msgstr "Otázky"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr "odeslat komentář"
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Zodpovědět svou vlastní otázku"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr "Odeslat odpověď"
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr "Přihlásit se/Zaregistrovat pro odeslání"
@@ -5320,7 +5304,15 @@ msgstr "Přihlásit se/Zaregistrovat pro odeslání"
msgid "Edit question"
msgstr "Upravit otázku"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5404,66 +5396,66 @@ msgstr "Zapsat se"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Lidé"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Seřadit dle »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "prohlédnout si lidi s nejvyšší reputací"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "vlivnost"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "prohlédnout si lidi, kteří se přidali zcela nedávno"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "poslední"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "prohlédnout si lidi, kteří se přidali jako první"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "prohlédnout si lidi podle jména"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "dle jména"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Nic nenalezeno."
@@ -5484,97 +5476,29 @@ msgid "Sign in"
msgstr "Přihlásit se"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "Změnit Email"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Uložit svou emailovou adresu"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr "Zadejte váš nový email do pole níže \npokud chcete použít další email prozasílání novinek.\n
Nyní používáte%%(email)s"
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr "Prosím zadejte vaši email adresu do pole níže.\nPlatná email adresa je vyžadována na tomto Q&A fóru. Pokud chcete,\nmůžeteodebírat novinky o zajímavých otázkách nebo z celého\nfóra přes email. Váš email je také použit k vytvoření unikátního \ngravatar obrázku pro váš\núčet. Emailové adresy nejsou nikdy nikomu zobrazeny nebo jakkoliv sdíleny s někým\njiným."
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr "Váš nový Email:\n(nebude nikomu zobrazen; musí být platný)"
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Uložit Email"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Ověřit email"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr "Email s ověřovacím odkazem byl zaslána na\n%%(email)s. Prosím následujte zaslaný odkaz link prostřednictvím\nwebového prohlížeče. Ověření emailu je nezbytné pro snazší zajištění správného používání emailu na Q&A. Pokud byste chtěl/a použít\ndalší email, prosím změňte jej znovu."
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Email nezměněn"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr "Vaše email adresa %%(email)s nebyla změněna. Pokud se rozhodnete pro změnu později - můžete tak vždy učinit upravením\nadresy v uživatelském profilu nebo použitím předchozího formuláře znovu."
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Email změněn"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr "\nVaše emailová adresa je nyní nastavena na %%(email)s.\nNovinky k otázkám, které máte v oblibě budou zaslány na tuto adresu.\nEmailová oznámení jsou zasílána jednou denně nebo méně často - pouze když se objeví\nněco nového."
+"href='%(change_email_url)s'>change it again."
+msgstr ""
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email prověřen"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5583,19 +5507,6 @@ msgid ""
"or less frequently."
msgstr "Děkujeme za ověření vašeho emailu! Nyní\nse můžete zeptat a zodpovídat dotazy. Také když\nnarazíte na velmi zajímavou otázku, můžete požádat o novinky - pak budete informován o změnách jednou denně\nanebo méně často."
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr "Potvrzovací email nebyl odeslán"
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr "Vaše současná emailová adresa %%(email)s byla\nověřena dříve, takže nový klíč nebyl odeslán. Můžete změnit email adresu použitou pro aktualizaci žádostí o zasílání, bude-li třeba."
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Registrace"
@@ -5766,7 +5677,7 @@ msgid "Login or email"
msgstr "Přihlášení nebo email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Heslo"
@@ -5785,6 +5696,12 @@ msgstr "Nové heslo"
msgid "Please, retype"
msgstr "Znovu opište, prosím"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Změnit heslo"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6090,7 +6007,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6114,22 +6031,30 @@ msgstr[2] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6158,10 +6083,6 @@ msgstr "\n
Systém nedokázal úspěšně zpracovat vaši zprávu, kvůli tomu
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6176,10 +6097,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6268,7 +6185,66 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Stránky"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Opravte prosím chybu vypsanou níže."
+msgstr[1] "Opravte prosím chyby vypsané níže."
+msgstr[2] "Opravte prosím chyby vypsané níže."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Nastavení zahrnuto v %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Nemáte oprávnění upravovat hodnoty."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Dokumentace"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Odhlásit se"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Domů"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Upravit nastavení webu"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Živé nastavení není povoleno pro tento web"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Všechny konfigurační možnosti musí být upraveny v settings.py souboru webu"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Nastavení skupin: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Sbalit vše"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6357,8 +6333,8 @@ msgid "Did not find what you were looking for?"
msgstr "Nenašel jste, co jste hledal/a?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Zadejte prosím svou otázku!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6406,7 +6382,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "použijte prosím nejvýše %(tag_count)s štítků, méně než %(max_chars)s znaků pro každý"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6771,7 +6747,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6906,6 +6882,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -7017,24 +7022,24 @@ msgstr "naposledy spatřen"
msgid "website"
msgstr "webové stránky"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "místo"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "věk"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "dnešní nevyužité hlasy"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "zbývající hlasy"
@@ -7133,7 +7138,7 @@ msgstr[0] "Sledované %(count)s osobou"
msgstr[1] "Sledované %(count)s osobami"
msgstr[2] "Sledované %(count)s osobami"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
@@ -7141,13 +7146,13 @@ msgstr[0] "Sledovaná %(count)s osoba"
msgstr[1] "Sledované %(count)s osoby"
msgstr[2] "Sledovaných %(count)s osob"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Vaše síť je prázdná. Chcete někoho následovat? - Pouze navštivte jejich profil a klepněte na \"následovat\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "%(username)s's síť je prázdná"
@@ -7253,7 +7258,7 @@ msgstr "Odpověď na:"
msgid "User profile"
msgstr "Uživatelský profil"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "komentáře a odpovědi otázek od ostatních"
@@ -7269,7 +7274,7 @@ msgstr "Graf uživatelské vlivnosti"
msgid "questions that user is following"
msgstr "otázky tohoto uživatele jsou následující"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "záznam uživatelova hlasování"
@@ -7278,11 +7283,11 @@ msgstr "záznam uživatelova hlasování"
msgid "votes"
msgstr "hlasy"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "nastavení přihlášení přes email"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "upravit tohoto uživatele"
@@ -7303,7 +7308,15 @@ msgstr "zkuste dát odpověď spíše než se zapojit do debaty"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7311,23 +7324,23 @@ msgstr ""
msgid "Contributors"
msgstr "Přispěvatelé"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ", jeden z těchto je povinný"
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "štítky:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(povinné)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Přepnout Markdown náhled editoru v reálném čase"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7601,23 +7614,23 @@ msgstr "nastavení"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "ne"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Jejda, omlouváme se - došlo k nějaké chybě"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Prosím přihlašte se, abyste mohl/a přispívat"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "Ve vašem příspěvku byl zachycen spam, omlouváme se, došlo-li k omylu"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7681,31 +7694,31 @@ msgstr "tato adresa je již obsazena někým jiným, zvolte prosím jinou"
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "je vyžadováno heslo"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "Heslo (prosím napište znovu)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "prosím opište heslo znovu"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "promiňte, zadaná hesla se neshodují, zkuste to prosím znovu"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "před 2 dny"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "včera"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
@@ -7713,7 +7726,7 @@ msgstr[0] "před %(hr)d hodinou"
msgstr[1] "před %(hr)d hodinami"
msgstr[2] "před %(hr)d hodinami"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7773,46 +7786,50 @@ msgstr "Váš požadavek byl uložen, ale emailová adresa %(email)s musí být
msgid "email update frequency has been set to daily"
msgstr "frekvence emailové aktualizace byla nastavena na denní"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "Sledování štítku bylo zrušeno (zpět)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Prosím přihlaste se pro sledování: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Prosím pro hlasování se přihlaste"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "Prosím přihlašte se pro smazání/obnovení příspěvků"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7841,113 +7858,113 @@ msgstr "Těšíme se na vaši odezvu! Prosím, napište nám příště. :)"
msgid "Privacy policy"
msgstr "Prohlášení o soukromí"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Promiňte, hledaný komentář byl smazán a již není přístupný"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "moderovat uživatele"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "uživatelský profil"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "přehled uživatelova profilu"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "nedávná aktivita uživatele"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profil - nedávná aktivita"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profil - odpovědi"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profil - hlasy"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "uživatelská vlivnost"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "Profil - Uživatelova vlivnost"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "oblíbené otázky uživatelů"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profil - oblíbené otázky"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "změny uloženy"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "emailová aktualizace zrušena"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profil - emailová oznámení"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Promiňte, anonymní uživatelé nemohou nahrávat soubory"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "povolené typy souborů jsou '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "maximální velikost nahrávaného souboru je %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Chyba při nahrávání souboru. Prosím kontaktujte spráce webu, děkujeme."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7956,45 +7973,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr "Můžete samozřejmě položit svou otázku anonymně. Když odešlete svůj příspěvek, budete přesměrován/a na přihlašovací/registrační stránku. Vaše otázka bude uložena pro stávající spojení a bude publikována, jakmile se přihlásíte. Přihlášení/registrace jsou velmi jednoduché. Přihlášení trvá okolo 30 vteřin, první registrace zabere minutu i méně."
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Prosím přihlašte se pro zodpovězení otázky"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Promiňte, zdá se, že jste odhlášen a nemůžete odesílat komentáře. Prosím přihlašte se. "
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Promiňte, anonymní uživatelé nemohou upravovat komentáře"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Promiňte, zdá se, že jste odhlášen a nemůžete mazat komentáře. Prosím přihlašte se."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Omlouváme se, zdá se, že máme nějaké technické potíže"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/cs_CZ/LC_MESSAGES/djangojs.po b/askbot/locale/cs_CZ/LC_MESSAGES/djangojs.po
index a9ae29d6..403306e7 100644
--- a/askbot/locale/cs_CZ/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/cs_CZ/LC_MESSAGES/djangojs.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-#
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Zadejte prosím nadpis otázky (>10 znaků)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
@@ -362,43 +366,43 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -507,195 +511,199 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "pro zavření klikněte"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
@@ -703,7 +711,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -767,7 +775,7 @@ msgstr "horizontální čára"
msgid "undo"
msgstr "zpět"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "vpřed"
@@ -783,15 +791,15 @@ msgstr "vložit webovou adresu, např. http://www.example.com \"předmět strán
msgid "upload file attachment"
msgstr "Prosím vyberte a nahrajte soubor:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/de/LC_MESSAGES/django.po b/askbot/locale/de/LC_MESSAGES/django.po
index e551c068..14753bc9 100644
--- a/askbot/locale/de/LC_MESSAGES/django.po
+++ b/askbot/locale/de/LC_MESSAGES/django.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-05-15 16:37+0000\n"
-"Last-Translator: Alexander Lieder python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Format der Tag Liste"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Benutze Wildcard Tags"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Default Anzahl maximaler Kommentare, die angezeigt werden"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Maximale Kommentar Länge, muss kleiner %(max_len)s sein"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Zeitlimit um Kommentare zu editieren"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Wenn nicht gecheckt, gibt es kein Zeitlimit um Kommentare zu editieren"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Wieviele Minuten ist es erlaubt einen Kommentar zu editieren"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Bitte prüfen Sie die vorhergehende Einstellung für eine Aktivierung."
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Sorry, deine Frage konnte nicht gepostet werden, weil dein Account über nicht genügend Rechte Verfügt
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Bitte nimm die beste Antwort auf diese Frage an." -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Bitte nimm die beste Antwort für diese Fragen an." -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3456,11 +3439,11 @@ msgid_plural "" msgstr[0] "
Hallo %(name)s,
Diese Frage wurde aktualisiert %(sitename)s
" msgstr[1] "Hallo %(name)s,
Diese %(num)d Fragen wurden aktualisiert auf %(sitename)s:
" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "Neue Frage" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr " Du kannst die Häufigkeit der E-Mails einstellen oder sie komplett abbestellen. MfG, Dein %(sitename)s Server.
Wenn du denkst, dass diese E-Mail ein Fehler ist, dann schicke eine Nachricht an den Administrator %(admin_email)s.
Currently you are using %%(email)s"
-msgstr "Bitte gebe in die untere Box deine neue E-Mail-Adresse ein, wenn du eine andere E-Mail-Adresse für Abbonements Updates haben möchtest .\n
Momentan benutzt du folgende E-Mail-Adresse: %%(email)s"
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Email-Adresse speichern"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Email-Adresse überprüfen"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr "Eine E-Mail mit einem Bestätigungslink wurde an diese Adresse %%(email)s geschickt. Bitte öffne Link in deinem Browser. E-Mail Verifizierung ist wichtig für die Sicherheit der Webseite. Wenn du eine andere Adresse benutzen möchtest, dann ändere deine E-Mail-Adresse hier."
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Email-Adresse nicht geändert"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Email-Adresse geändert"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr "\nDeine E-Mail-Adresse ist jetzt %%(email)s.\nUpdates zu den Fragen, die du magst werden an diese Adresse geschickt."
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email-Adresse bestätigt"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5563,19 +5488,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Registrierung"
@@ -5746,7 +5658,7 @@ msgid "Login or email"
msgstr "Login oder Email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Passwort"
@@ -5765,6 +5677,12 @@ msgstr "Neues Passwort"
msgid "Please, retype"
msgstr "Bitte wiederholen"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Passwort ändern"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6070,7 +5988,7 @@ msgid ""
" "
msgstr "\n Ein Kommentar von %(author)s:\n "
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr "Darunter ist die Kopie von deinem Beitrag"
@@ -6093,22 +6011,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6137,10 +6063,6 @@ msgstr "\n
Das System war nicht in der Lage deine Nachricht ordnungsgemäß zu
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6155,10 +6077,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr "Bitte wähle einen guten Titel für deine Frage"
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6247,7 +6165,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Seiten"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Bitte korrigiere folgenden Fehler."
+msgstr[1] "Bitte korrigiere folgende Fehler."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Configuracions incloses a %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Du hast keine Berechtigung die Werte zu ändern."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Ausloggen"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Home"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6335,8 +6311,8 @@ msgid "Did not find what you were looking for?"
msgstr "Nicht gefunden wonach Du gesuchst hast?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Bitte stelle Deine Frage!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6382,7 +6358,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "Bitte benutze bis zu %(tag_count)s Tags, wobei jeder Tag weniger als %(max_chars)s Zeichen haben soll"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6745,7 +6721,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6880,6 +6856,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6991,24 +6996,24 @@ msgstr "Zuletzt gesehen"
msgid "website"
msgstr "Webseite"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "Ort"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "Alter"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "Ungenutzte Votes heute"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "Votes übrig"
@@ -7106,20 +7111,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] "Beobachtet von %(count)s Person"
msgstr[1] "Beobachtet von %(count)s Nutzern"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "Beobachte %(count)s Person"
msgstr[1] "Beobachte %(count)s Nutzern"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Dein Netzwerk ist leer. Du möchtest jemanden Folgen? - Besuche einfach sein Profil und klicke auf \"folgen\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "%(username)s's Netzwerk ist leer"
@@ -7219,7 +7224,7 @@ msgstr "Antworte:"
msgid "User profile"
msgstr "Benutzerprofil"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "Kommentare und Antworten"
@@ -7235,7 +7240,7 @@ msgstr "Grafik zu Karma-Statistik"
msgid "questions that user is following"
msgstr "Fragen denen dieser Benutzer folgt"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "Abstimmungsverhalten"
@@ -7244,11 +7249,11 @@ msgstr "Abstimmungsverhalten"
msgid "votes"
msgstr "Votes"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "Email-Abonnementeinstellungen"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "Moderiere diesen Benutzer"
@@ -7269,7 +7274,15 @@ msgstr "Bitte versuche eine konkrete Antwort zu geben, und nicht in eine Diskuss
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7277,23 +7290,23 @@ msgstr ""
msgid "Contributors"
msgstr "Mitwirkende"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ", eines hiervon wird benötigt"
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "Tags:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(Pflichtfeld)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Die Markdown-Echtzeit-Vorschau ein- oder ausblenden"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7564,23 +7577,23 @@ msgstr "Einstellungen"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "0"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "oops, Verzeihung - hier gab es ein Problem"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Zum Schreiben bitte einloggen"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "In deinem Eintrag wurde Spam entdeckt, Entschuldigung wenn dies ein Fehler war"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr "Diese Funktion steht nur Moderatoren und Administratoren zur verfügung"
@@ -7644,38 +7657,38 @@ msgstr "Diese Email-Adresse ist bereits in Benutzung, bitte gebe eine andere ein
msgid "this email address is not authorized"
msgstr "Diese E-Mail Adresse ist nicht autorisiert"
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "Ein Passwort wird benötigt"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "Passwort (bitte wiederholen)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "Bitte gebe Dein Passwort erneut ein"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "Die beiden eingegebenen Passwörter stimmen nicht überein, bitte erneut versuchen"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "vor 2 Tagen"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "gestern"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "vor %(hr)d Stunde"
msgstr[1] "vor %(hr)d Stunden"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7734,46 +7747,50 @@ msgstr "Deine Email Adresse %(email)s muss noch verifiziert werden, weitere Deta
msgid "email update frequency has been set to daily"
msgstr "Die Häufigkeit der Benachrichtigungen wurde auf \"täglich\" gesetzt."
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Zum Abstimmen bitte einloggen"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "Bitte einloggen um Einträge zu löschen/wiederherzustellen"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr "Sorry, nur Moderatoren dürfen diese Funktion benutzen"
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7802,113 +7819,113 @@ msgstr "Wir freuen uns auf Dein Feedback! Gerne auch nächstes Mal :)"
msgid "Privacy policy"
msgstr "Datenschutzrichtlinien"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr "Vorgeschlagene Tags"
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "Moderiere Benutzer"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "Benutzerprofil"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "Benutzerprofil-Übersicht"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "Neueste Aktivitäten"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "Profil - neueste Aktivitäten"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "Profil - Erwiderungen"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "Profil - Votes"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "Benutzer Karma"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "Profil - Benutzers Karma"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "Fragen in der Favoritenliste des Benutzers"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "Fragen in der Favoritenliste"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "Änderungen gespeichert"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "Email-Benachrichtigungen abgestellt"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "Profil - Email-Abonnements"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Tut mir leid, anonyme Benuter können keine Dateien hochladen"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "Erlaubte Dateitypen: '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "maximale Größe für einen Upload beträgt %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Fehler beim Hochladen. Bitte kontaktiere den Seitenadministrator. Vielen Dank."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7917,45 +7934,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr "Du kannst deine Frage auch schon als Gast formulieren. Wenn du auf Absenden klickst wirst du automatisch zur Anmelde-/Registrierungsseite weitergeleitet. Deine Frage wird solange zwischengespeichert und nach erfolgreichem einloggen veröffentlicht. Angemeldet bist Du in wenigen Sekunden, die Registrierung dauert weniger als eine Minute."
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Zum Beantworten bitte einloggen"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr "Dieser Inhalt ist verboten"
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Sembla que heu sortit i no podeu posar comentaris. Entreu."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Entschuldigung, Anonyme Benutzer können keine Kommentare ändern"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Entschuldigung, wir haben gerade ein paar technische Probleme"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/de/LC_MESSAGES/djangojs.po b/askbot/locale/de/LC_MESSAGES/djangojs.po
index 1cc61a80..aab4aa91 100644
--- a/askbot/locale/de/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/de/LC_MESSAGES/djangojs.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-05-12 04:06+0000\n"
-"Last-Translator: Alexander Lieder
"
-msgstr "Unter deinen eigenen Beiträgen kannst du jederzeit Kommentare hinterlassen
"
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr "Bitte logge Dich ein, damit Du Kommentare posten kannst. "
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Bitte gebe den Titel der Frage ein (>10 Zeichen)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr "speichern"
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr "Gebe die URL-Adresse des Logos ein oder lade ein Logo-Bild hoch"
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr "Bist du dir sicher, dass du das Bild entfernen möchtest?"
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr "Logo ändern"
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr "Logo hinzufügen"
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr "Tag \"%s\" wurde bereits hinzugefügt, es besteht keine Notwendigkeit ihn zweimal anzugeben (drücke\"Entfernen\" zum Löschen)"
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] "Es ist maximal %s Tag erlaubt"
msgstr[1] "Es sind maximal %s Tags erlaubt"
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr "Kategorie löschen?"
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr "bearbeiten"
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr "Bitte gebe mindestens einen Tag ein"
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr "Existiert bereits"
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr "Kategorie hinzufügen"
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr "Tags speichern"
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr "Benutzername:"
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr "Gruppenname:"
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr "Geteilt mit folgenden Benutzern:"
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr "Geteilt mit folgenden Gruppen:"
@@ -497,202 +501,206 @@ msgstr "Eine Gruppe hinzufügen"
msgid "add"
msgstr "hinzufügen"
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr "und"
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "Zum Schließen klicken"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr "Klicken, um das Kommentar zu editieren"
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr "In eine Antwort umwandeln"
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr "OK"
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr "Löschen"
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr "Hochgeladene Datei: %s"
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr "Wähle ein anderes Bild"
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr "Wähle eine andere Datei"
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr "Ein Fehler ist aufgetreten. Das tut uns leid."
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr "Wähle ein Bild, das du einfügen möchtest"
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr "Wähle eine Datei, die du einfügen möchtest"
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr "Die erlaubten Dateitypen sind:"
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr "Oder füge hier die URL der Datei ein"
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr "Speichern"
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr "Gespeichert"
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr "aktiviert"
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr "deaktiviert"
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr "Gruppe %(name)s existiert bereits. Gruppennamen sind unterscheiden nicht zwischen Groß-und Kleinschreibung."
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr "Siehe Fragen mit den Tags '%s'"
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr "vor einer Minute"
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr "%d Minuten"
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr "über eine Stunde"
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr "%d Stunden"
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr "gestern"
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr "%d Tagen"
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr "vor einem Monat"
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr "%d Monaten"
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr "vor einem Jahr"
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr "%d Jahren"
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr "Jan."
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr "Feb."
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr "März"
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr "Apr."
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr "Mai"
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr "Juni"
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr "Juli"
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr "Aug."
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr "Sep"
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr "Okt"
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr "Nov"
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr "Dez"
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr "vor 2 Tagen"
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] "vor %s Stunde"
msgstr[1] "vor %s Stunden"
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -755,7 +763,7 @@ msgstr "horizontale Linie"
msgid "undo"
msgstr "Rückgängig"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "Wiederholen"
@@ -771,15 +779,15 @@ msgstr "URL eingeben, zum Beispiel http://ask.justnetwork.eu/ \"Meine Webseite\"
msgid "upload file attachment"
msgstr "Bitte wähle und lade eine Datei hoch:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr "Bitte eine kurze Bildbeschreibung"
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr "Dateiname"
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr "Linktext"
diff --git a/askbot/locale/el/LC_MESSAGES/django.po b/askbot/locale/el/LC_MESSAGES/django.po
index e39d76d1..2bc6cad4 100644
--- a/askbot/locale/el/LC_MESSAGES/django.po
+++ b/askbot/locale/el/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Evgeny Fadeev python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr ""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3453,11 +3436,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3480,86 +3463,86 @@ msgstr[1] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ""
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ""
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3570,57 +3553,57 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3630,103 +3613,103 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3734,221 +3717,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr ""
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr ""
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr ""
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr ""
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4218,49 +4201,57 @@ msgstr ""
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4282,17 +4273,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4492,19 +4483,14 @@ msgstr ""
msgid "back"
msgstr ""
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr ""
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr ""
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4512,21 +4498,21 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr ""
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr ""
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4539,11 +4525,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4636,7 +4621,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr ""
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5121,61 +5106,61 @@ msgstr ""
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr ""
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr ""
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr ""
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5184,87 +5169,87 @@ msgstr ""
msgid "delete this comment"
msgstr ""
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr ""
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr ""
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr ""
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr ""
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr ""
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5273,23 +5258,23 @@ msgstr ""
msgid "Questions"
msgstr ""
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr ""
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5297,7 +5282,15 @@ msgstr ""
msgid "Edit question"
msgstr ""
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5381,66 +5374,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr ""
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr ""
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr ""
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr ""
@@ -5461,97 +5454,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr ""
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr ""
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5560,19 +5485,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5743,7 +5655,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr ""
@@ -5762,6 +5674,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr ""
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6067,7 +5985,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6090,22 +6008,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6134,10 +6060,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6152,10 +6074,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6244,7 +6162,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6332,7 +6308,7 @@ msgid "Did not find what you were looking for?"
msgstr ""
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
+msgid "Ask your question!"
msgstr ""
#: templates/main_page/tab_bar.html:11
@@ -6379,7 +6355,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6742,7 +6718,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6877,6 +6853,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6988,24 +6993,24 @@ msgstr ""
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr ""
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr ""
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr ""
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr ""
@@ -7103,20 +7108,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7216,7 +7221,7 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr ""
@@ -7232,7 +7237,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr ""
@@ -7241,11 +7246,11 @@ msgstr ""
msgid "votes"
msgstr ""
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr ""
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7266,7 +7271,15 @@ msgstr ""
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7274,23 +7287,23 @@ msgstr ""
msgid "Contributors"
msgstr ""
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr ""
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr ""
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7561,23 +7574,23 @@ msgstr ""
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7641,38 +7654,38 @@ msgstr ""
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr ""
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr ""
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr ""
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr ""
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr ""
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7731,46 +7744,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr ""
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7799,113 +7816,113 @@ msgstr ""
msgid "Privacy policy"
msgstr ""
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr ""
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr ""
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr ""
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr ""
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr ""
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr ""
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr ""
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr ""
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr ""
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr ""
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr ""
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7914,45 +7931,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/el/LC_MESSAGES/djangojs.po b/askbot/locale/el/LC_MESSAGES/djangojs.po
index 36a53929..8209946b 100644
--- a/askbot/locale/el/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/el/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr ""
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -495,202 +499,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr ""
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -753,7 +761,7 @@ msgstr ""
msgid "undo"
msgstr ""
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr ""
@@ -769,15 +777,15 @@ msgstr ""
msgid "upload file attachment"
msgstr ""
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/es/LC_MESSAGES/django.po b/askbot/locale/es/LC_MESSAGES/django.po
index 5e3093cc..ff1bec50 100644
--- a/askbot/locale/es/LC_MESSAGES/django.po
+++ b/askbot/locale/es/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-04-15 19:11+0000\n"
-"Last-Translator: Gustavo Gómez python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Atención: después de marcar esto, por favor haz un backup de tu base de datos y ejecuta el siguiente comando: python manage.py fix_question_tags
para renombrar todas las tags globalmente"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Formato de la lista de etiquetas"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Selecciona el formato para mostrar las etiquetas, como un listado simple, o como una nube de etiquetas"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Utilizar etiquetas comodín"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Las etiquetas comodín pueden ser utilizadas para seguir o ignorar muchas etiquetas de una vez, una etiqueta comodín válida tiene un asterisco al final de la misma"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Cantidad máxima por defecto, de comentarios a mostrarse para cada entrada"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Tamaño máximo de un comentario, debe ser menor a %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Limitar el tiempo para editar los comentarios"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Si no está marcado, no existirá tiempo para editar los comentarios"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Minutos permitidos para editar un comentario"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Para activar este ajuste, marca el anterior"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Lo sentimos, tu pregunta no puede ser enviada porque no existen suficiente privilegios en tu cuenta
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Aceptar la mejor respuesta para %(question_count)d de tus preguntas" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Por favor, acepta la mejor respuesta para la pregunta:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Por favor, acepta la mejor respuesta para estas preguntas:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "%(question_count)d pregunta actualizada de %(topics)s" msgstr[1] "%(question_count)d preguntas actualizadas de %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3454,11 +3437,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "nueva pregunta" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3481,86 +3464,86 @@ msgstr[1] "%(question_count)d preguntas sin responder de %(topics)s"
msgid "Please log in to use %s"
msgstr "Por favor, haz log in para utilizar %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Lo sentimos, no puedes aceptar o cancelar las mejores respuestas porque tu cuenta está bloqueada"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Lo sentimos, no puedes aceptar o cancelar las mejores respuestas porque tu cuenta ha sido suspendida"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ">%(points)s puntos necesarios para aceptar o cancelar tu propia respuesta o tu propia pregunta"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Lo siento, sólo podrás aceptar esta pregunta después de %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Lo siento, sólo los moderadores o el autor de la pregunta %(username)s pueden aceptar o cancelar la mejor respuesta"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Lo sentimos, tu cuenta ha sido bloqueada"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Lo sentimos, tu cuenta ha sido suspendida"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ">%(points)s puntos requeridos para votar positivamente "
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s puntos requeridos para votar negativamente"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Lo sentimos, los usuarios bloqueados no pueden subir ficheros"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Lo sentimos, los usuarios suspendidos no pueden subir ficheros"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3571,57 +3554,57 @@ msgid_plural ""
msgstr[0] "Lo sentimos, los comentarios (a excepción del último) sólo se pueden editar al %(minutes)s minuto de enviar"
msgstr[1] "Lo sentimos, los comentarios (a excepción del último) sólo se pueden editar a los %(minutes)s minutos de enviar"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Lo sentimos, pero sólo los dueños de los posts o los moderadores pueden editar comentarios"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Lo sentimos, debido a que tu cuenta está suspendida no puedes comentar tus propios posts"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Lo sentimos, para comentar cualquier post se requiere un mínimo de %(min_rep)s de reputación. Aunque también puedes comentar tus propios posts y respuestas a tus preguntas."
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Este post ha sido eliminado y puede ser visto sólo por los dueños de los posts, el administrador del sitio y los moderadores."
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Lo sentimos, sólo los moderadores, los administradores del sitio y los dueños de los comentarios pueden editar posts eliminados."
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Lo sentimos, debido a que tu cuenta ha sido bloqueda, no se pueden editar los posts"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Lo sentimos, debido a que tu cuenta está suspendida sólo puedes editar tus propios posts"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Lo sentimos, para editar los post de la wiki, se necesitan un mínimo de %(min_rep)s puntos de reputación "
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Lo sentimos, para editar los post de otras personas, se necesitan un mínimo de %(min_rep)s puntos de reputación"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3631,103 +3614,103 @@ msgid_plural ""
msgstr[0] "Lo sentimos, no puedes eliminar tus preguntas debido a que tiene una respuestas con votos positivos enviada por otro usuarios"
msgstr[1] "Lo sentimos, no puedes eliminar tus preguntas debido a que tiene varias respuestas con votos positivos enviadas por otros usuarios"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Lo sentimos, debido a que tu cuenta está bloqueada no puedes eliminar posts"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Lo sentimos, debido a que tu cuenta está suspendida sólo puedes eliminar tus propios posts"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Lo sentimos, debido a que tu cuenta está bloqueda no puedes cerrar las preguntas"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Lo sentimos, debido a que tu cuenta está suspendida no puedes cerrar preguntas"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Lo sentimos, para cerrar posts de otros usuarios, se necesita una reputación mínima de %(min_rep)s puntos"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Lo sentimos, para cerrar tu propia pregunta, necesitas un mínimo de %(min_rep)s puntos de reputación"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Lo sentimos, sólo los administradores, moderadores y los dueños de los posts con reputación mayor de %(min_rep)s pueden reabrir las preguntas"
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Lo sentimos, para reabrir una pregunta se necesita un mínimo de %(min_rep)s de puntos de reputación"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "no se puede eliminar una denuncia no existente"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3735,221 +3718,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "no tienes permiso para eliminar todas las denuncias"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "no existen denuncias para esta entrada"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Lo sentimos, sólo los dueños de las preguntas, los administradores del sitio y los moderadores pueden re-etiquetar las preguntas eliminadas"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Lo sentimos, debido a que tu cuenta está bloqueada no puedes re-etiquetar preguntas"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Lo sentimos, debido a que tu cuenta está suspendida, sólo puedes re-etiquetar tus propias preguntas"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Lo sentimos, para re-etiquetar preguntas es necesario un mínimo de %(min_rep)s puntos de reputación"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Lo sentimos, debido a que tu cuenta ha sido bloqueada no puedes borrar comentarios"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Lo sentimos, debido a que tu cuenta está suspendida sólo puedes borrar tus propios comentarios"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Lo sentimos, para eliminar comentarios necesitas %(min_rep)s puntos de reputación "
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "el %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "en dos días"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "mañana"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "en %(hr)d hora"
msgstr[1] "en %(hr)d horas"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "en %(min)d minuto"
msgstr[1] "en %(min)d minutos"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d día"
msgstr[1] "%(days)d días"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Los nuevos usuarios deben esperar %(days)s antes de poder responder a sus propias preguntas. Puedes enviar tu respuesta %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anónimo"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administrador del sitio"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderador"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Usuario Suspendido"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Usuario Bloqueado"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Usuario Registrado"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Usuario Visto"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Usuario Aprobado"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "el karma de %(username)s es %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "una medalla de oro"
msgstr[1] "%(count)d medallas de oro"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "una medalla de plata"
msgstr[1] "%(count)d medallas de plata"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "una medalla de bronce"
msgstr[1] "%(count)d medallas de bronce"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s y %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s tiene %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Enhorabuena, has recibido una medalla '%(badge_name)s'. Puedes comprobarlo en tu perfil."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Tu suscripción a la etiqueta se ha guardado, gracias!"
@@ -4219,49 +4202,57 @@ msgstr "Muy activo con una etiqueta"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Lo sentimos, esta pregunta se ha eliminado y no puedes acceder a ella"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Lo sentimos, la respuesta que estás buscando no se encuentra disponible, debido a que la pregunta de la que depende se ha eliminado"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Lo sentimos, esta respuesta ha sido eliminada y ya no está accesible"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Lo sentimos, el comentario que estás buscando ya no se encuentra accesible porque la pregunta de la que dependía se ha eliminado."
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "Lo sentimos, el comentario que estás buscando ya no se encuentra accesible porque la respuesta de la que dependía se ha eliminado."
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4283,17 +4274,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4493,19 +4484,14 @@ msgstr "Editar respuesta"
msgid "back"
msgstr "regresar"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revisión"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Guardar edición"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4513,21 +4499,21 @@ msgstr "Guardar edición"
msgid "Cancel"
msgstr "Cancelar"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "ocultar vista previa"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "mostrar vista previa"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4540,11 +4526,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4637,7 +4622,7 @@ msgstr "medalla de plata: ofrecida ocasionalmente por contribuciones muy importa
msgid "bronze badge: often given as a special honor"
msgstr "medalla de bronce: a menudo como un honor especial"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5122,61 +5107,61 @@ msgstr "numero actual de votos"
msgid "anonymous user"
msgstr "usuario anonimo"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "preguntado"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "respondido"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "publicado"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "este post pertenece en la comunidad wiki"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Este post pertenece a la wiki.\n Cualquier usuario con un karma mayor a %(wiki_min_rep)s puede mejorarlo si lo desea."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "actualizado"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "ver preguntas etiquetadas con '%(tag)s'"
@@ -5185,87 +5170,87 @@ msgstr "ver preguntas etiquetadas con '%(tag)s'"
msgid "delete this comment"
msgstr "eliminar este comentario"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "editar"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "seguir a %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "dejar de seguir a %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "siguiendo a %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "Imagen Gravatar de %(username)s "
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "la pagina de %(username)s's es %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "anterior"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "pagina actual"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "pagina siguiente"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "respuestas a %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "sin respuestas todavia"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s denuncias nuevas en posts y %(seen)s anteriores"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s denuncias nuevas en posts"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s denuncias en posts"
@@ -5274,23 +5259,23 @@ msgstr "%(seen)s denuncias en posts"
msgid "Questions"
msgstr "Preguntas"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Responde tu pregunta"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5298,7 +5283,15 @@ msgstr ""
msgid "Edit question"
msgstr "Editar pregunta"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5382,66 +5375,66 @@ msgstr "Suscribir"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Usuarios"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Ordenar por »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "ver usuarios con la reputacion mas alta"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "karma"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "ver usuarios que se han registrado recientemente"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "reciente"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "ver usuarios que se registraron primero"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "ver usuarios ordenados por nombre"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "por nombre de usuario"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Nada encontrado."
@@ -5462,97 +5455,29 @@ msgid "Sign in"
msgstr "Regístrate"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Guardar tu dirección de email"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Guardar Email"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Validar email"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Email no ha sido modificado"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Email modificado"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email verificado"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5561,19 +5486,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Registro"
@@ -5744,7 +5656,7 @@ msgid "Login or email"
msgstr "Login o email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Contraseña"
@@ -5763,6 +5675,12 @@ msgstr "Nueva contraseña"
msgid "Please, retype"
msgstr "Por favor, teclea de nuevo"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Cambiar Contraseña"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6068,7 +5986,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6091,22 +6009,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6135,10 +6061,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6153,10 +6075,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6245,7 +6163,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Sitios"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Por favor, corrige el error de abajo."
+msgstr[1] "Por favor, corrige los errores de abajo."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Ajustes incluidos en %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "No tienes permiso para editar los valores."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentación"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Salir"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Inicio"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Editar los ajustes del Sitio"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Los ajustes directos están desactivados para este sitio"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Todas las opciones de configuración deben editarse en el archivo settings.py del sitio"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Ajustes del grupo: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Expandir todo"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6333,8 +6309,8 @@ msgid "Did not find what you were looking for?"
msgstr "No encontraste lo que estabas buscando?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Por favor, envia tu pregunta"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6380,7 +6356,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "por favor utiliza %(tag_count)s etiquetas, de menos de %(max_chars)s caracteres cada una"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6743,7 +6719,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6878,6 +6854,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6989,24 +6994,24 @@ msgstr "últimas visita"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "localización"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "edad"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "votos no utilizados el día de hoy"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "votos restantes"
@@ -7104,20 +7109,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] "Seguido por %(count)s persona"
msgstr[1] "Seguido por %(count)s personas"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "Siguiendo %(count)s persona"
msgstr[1] "Siguiendo %(count)s personas"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Tu red esta vacia. Te gustaria seguir a alguien? Solo tienes que visitar los perfiles que desees y pinchar en \"seguir\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "la red de %(username)s esta vacia"
@@ -7217,7 +7222,7 @@ msgstr "Respuesta a:"
msgid "User profile"
msgstr "Pefil de usuario"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "comentar y responder otras preguntas"
@@ -7233,7 +7238,7 @@ msgstr ""
msgid "questions that user is following"
msgstr "preguntas que el usuario esta siguiendo"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "registro de votos de este usuario"
@@ -7242,11 +7247,11 @@ msgstr "registro de votos de este usuario"
msgid "votes"
msgstr "votos"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "configuraciones de suscripción por email"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "moderar este usuario"
@@ -7267,7 +7272,15 @@ msgstr "trata de dar una respuesta, en lugar de iniciar un debate"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7275,23 +7288,23 @@ msgstr ""
msgid "Contributors"
msgstr "Colaboradores"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(requerido)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Vista preliminar en tiempo real del editor Markdown"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7562,23 +7575,23 @@ msgstr "ajustes"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Ups, lo sentimos, ha habido un error"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Por favor, haz login para enviar post"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "Se ha detectado spam en tu post, perdona si esto es un error"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7642,38 +7655,38 @@ msgstr "este email está siendo utilizado por algún usuario, por favor seleccio
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "una contraseña es requerida"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "por favor, re-escribe tu contraseña"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "lo sentimos, las contraseñas que haz ingresado no coinciden, intenta de nuevo"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2 días atrás"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "ayer"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "hace %(hr)d hora"
msgstr[1] "hace %(hr)d horas"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7732,46 +7745,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "la frecuencia de notificaciones por email ha sido cambiada a diario"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "La suscripción a la etiqueta se ha cancelado (deshacer)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Por favor, regístrate para poder suscribirte a %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Por favor, regístrate para votar"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7800,113 +7817,113 @@ msgstr "Esperamos con interés escuchar sus comentarios! :)"
msgid "Privacy policy"
msgstr "Políticas de privacidad"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Lo sentimos, el comentario que estás buscando se ha eliminado y no se encuentra disponible"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "moderar usuario"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "perfil de usuario"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "vista del perfil de usuario"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "actividad reciente del usuario"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "perfil - actividad reciente"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "perfil - respuestas"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "pefil - votos"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "preguntas favoritas del usuario"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "pefil - preguntas favoritas"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "cambios guardados"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "notificaciones por email cancelada"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "perfil - notificación por email"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Lo sentimos, los usuarios anónimos no pueden subir archivos"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "los ficheros permitidos son '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "el tamaño máximo para subir archivos es de %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Error subiendo archivo. Por favor, contacta con el administrador del sitio. Gracias"
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7915,45 +7932,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Por favor, haz login para responder preguntas"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Lo sentimos, estás desconectado y no puedes enviar comentarios. Por favor regístrate."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Lo sentimos, los usuarios anónimos no pueden editar comentarios."
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Lo sentimos, estás desconectado y no puedes eliminar comentarios. Por favor, regístrate."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "lo sentimos, tenemos dificultades técnicas"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/es/LC_MESSAGES/djangojs.po b/askbot/locale/es/LC_MESSAGES/djangojs.po
index 6f490cea..ec38c0a6 100644
--- a/askbot/locale/es/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/es/LC_MESSAGES/djangojs.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Victor Trujillo <>, 2012.
+# Victor Trujillo <>, 2012
msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Por favor introduce el titulo de la pregunta (> de 10 letras)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -496,202 +500,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "haz click para cerrar"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -754,7 +762,7 @@ msgstr "barra horizontal"
msgid "undo"
msgstr "deshacer"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "rehacer"
@@ -770,15 +778,15 @@ msgstr "introduzca direcciones web, ejemplo:
http://www.cnprog.com/ \"t
msgid "upload file attachment"
msgstr "Por favor, selecciona y sube un archivo:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/fi/LC_MESSAGES/django.po b/askbot/locale/fi/LC_MESSAGES/django.po
index 318ebc88..af04fb4e 100644
--- a/askbot/locale/fi/LC_MESSAGES/django.po
+++ b/askbot/locale/fi/LC_MESSAGES/django.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Evgeny Fadeev python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Huomio: tämän tarkistamisen jälkeen varmista tietokanta ja suorita seuraava komento: python manage.py fix_question_tags
nimetäksesi kaikki tagit uudelleen"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Tagilistan muoto"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Valitse, missä muodossa tagit näytetään - joko yksinkertaisena listana tai tagipilvenä"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Käytä jokerimerkki -tagejä."
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Jokerimerkki -tagien avulla voi seurata tai jättää huomiotta monta tagiä kerralla. Jokerimerkki tulee laittaa tagin loppuun."
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Merkintöjen alla näytettävien kommenttien maksimimäärä (vakio)"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Kommentin enimmäispituus, täytyy olla < %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Rajoita kommenttien muokkaamiseen käytettävää aikaa"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Jos ruutu on tyhjä, kommenttien muokkaamiselle ei ole aikarajaa"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Kommenttien muokkaamiseen käytettävissä (minuuttia)"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Salli asetus klikkaamalla edellistä ruutua"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Valitettavasti kysymystäsi ei voitu lisätä sivulle käyttäjätilisi riittämättömien oikeuksien vuoksi.
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Hyväksy paras vastaus %(question_count)d:lle kysymyksistäsi" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Ole hyvä ja valitse paras vastaus tähän kysymykseen:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Ole hyvä ja hyväksy paras vastaus näihin kysymyksiin" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "%(question_count)d päivitetty kysymys aiheesta %(topics)s" msgstr[1] "%(question_count)d päivitettyä kysymystä aiheesta %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3455,11 +3438,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "uusi kysymys" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3482,86 +3465,86 @@ msgstr[1] "%(question_count)d vastaamatonta kysymystä aiheesta %(topics)s"
msgid "Please log in to use %s"
msgstr "Ole hyvä ja kirjaudu sisään käyttääksesi %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Valitettavasti tilisi on lukittu, etkä voi hyväksyä tai hylätä parhaita vastauksia"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Valitettavasti tilisi on jäähyllä, etkä voi hyväksyä tai hylätä parhaita vastauksia"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr "Tarvitset >%(points)s pistettä voidaksesi hyväksyä tai hylätä oman vastauksesi omaan kysymykseesi"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Valitettavasti voit hyväksyä tämän vastauksen vasta %(will_be_able_at)s:n jälkeen"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Valitettavasti vain moderaattorit tai kysymyksen alkuperäinen esittäjä - %(username)s - voivat hyväksyä tai hylätä parhaan vastauksen"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Valitettavasti tilisi näyttää olevan lukittu"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Valitettavasti tilisi näyttää olevan jäähyllä"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "tarvitset >%(points)s points äänestämiseen "
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s mainetta tarvitaan"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Valitettavasti lukitut käyttäjät eivät voi ladata tiedostoja"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Valitettavasti jäähyllä olevat käyttäjät eivät voi ladata tiedostoja"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3572,57 +3555,57 @@ msgid_plural ""
msgstr[0] "Valitettavasti kommentteja (viimeisintä lukuun ottamatta) voi muokata vain %(minutes)s minuutin ajan julkaisemisen jälkeen"
msgstr[1] "Valitettavasti kommentteja (viimeisintä lukuun ottamatta) voi muokata vain %(minutes)s minuutin ajan julkaisemisen jälkeen"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Valitettavasti vain merkintöjen kirjoittajat ja moderaattorit voivat muokata kommentteja"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Valitettavasti tilisi on jäähyllä, ja voit kommentoida vain omia merkintöjäsi"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s pisteen maineen voidaksesi kommentoida merkintöjä. Voit kuitenkin kommentoida omia merkintöjäsi ja omiin kysymyksiisi esittämiäsi vastauksia"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Tämä merkintä on poistettu, ja näkyy vain merkinnän kirjoittajalle sekä sivun ylläpitäjille ja moderaattoreille"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Valitettavasti vain moderaattorit, ylläpitäjät ja merkintöjen kirjoittavat voivat muokata poistettuja merkintöjä"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Valitettavasti tilisi on lukittu, etkä voi muokata merkintöjä"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Valitettavasti tilisi on jäähyllä, ja voit muokata vain omia merkintöjäsi"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen muokataksesi wiki-merkintöjä"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen muokataksesi muiden kirjoittamia merkintöjä"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3632,103 +3615,103 @@ msgid_plural ""
msgstr[0] "Valitettavasti et voi poistaa kysymystäsi, sillä jonkun muun vastaus kysymykseen on saanut positiivisia ääniä"
msgstr[1] "Valitettavasti et voi postaa kysymystäsi, sillä muiden vastaukset kysymykseen ovat saaneet positiivisia ääniä"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Valitettavasti tilisi on lukittu, etkä voi poistaa merkintöjä"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Valitettavasti tilisi on jäähyllä, ja voit poistaa vain omia merkintöjäsi"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Valitettavasti tilisi on lukittu, etkä voi sulkea kysymyksiä"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Valitettavasti tilisi on jäähyllä, etkä voi sulkea kysymyksiä"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen sulkeaksesi muiden merkintöjä "
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen sulkeaksesi oman kysymyksesi "
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Valitettavasti vain ylläpitäjät ja moderaattorit, tai merkintöjen kirjoittajat, joilla on vähintään > %(min_rep)s:n maine, voivat avata kysymyksiä uudelleen."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen avataksesi oman kysymyksesi uudelleen"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "olematonta liputusta ei voi poistaa"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3736,221 +3719,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "sinulla ei ole lupaa poistaa kaikkia liputuksia"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "tällä merkinnällä ei ole liputuksia"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Valitettavasti vain kysymysten kysyjät, ylläpitäjät ja moderaattorit voivat tagätä poistettuja kysymyksiä uudelleen"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Valitettavasti tilisi on lukittu, etkä voi tagätä kysymyksiä uudelleen"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Valitettavasti tilisi on jäähyllä, ja voit tagätä vain omia kysymyksiäsi uudelleen"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen tagätäksesi kysymyksiä uudelleen"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Valitettavasti tilisi on lukittu, etkä voi poistaa kommenttia"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Valitettavasti tilisi on jäähyllä, ja voit poistaa vain omia kommenttejasi"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Valitettavasti tarvitset vähintään %(min_rep)s:n maineen voidaksesi poistaa kommentteja"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "%(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "kahdessa päivässä"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "huomenna"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "%(hr)d:ssa tunnissa"
msgstr[1] "%(hr)d:ssa tunnissa"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "%(min)d:ssä minuutissa"
msgstr[1] "%(min)d:ssä minuutissa"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d:ssä päivässä"
msgstr[1] "%(days)d:ssä päivässä"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Uusien käyttäjien on odotettava %(days)s päivää, ennen kuin he voivat vastata omaan kysymykseensä. Voit vastata kysymykseen %(left)s:n päivän kuluttua."
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anonyymi"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Sivun ylläpitäjä"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Foorumin Moderaattori"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Käyttäjä jäähyllä"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Lukittu käyttäjä"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Rekisteröity käyttäjä"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Seurattu käyttäjä"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Hyväksytty käyttäjä"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s mainepisteet ovat %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "yksi kultamitali"
msgstr[1] "%(count)d kultamitalia"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "yksi hopeamitali"
msgstr[1] "%(count)d hopeamitali"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "yksi pronssimitali"
msgstr[1] "%(count)d pronssimitali"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s ja %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "käyttäjällä %(user)s on %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Onneksi olkoon, olet ansainnut '%(badge_name)s'-mitalin. Katso: your profile."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Kiitos! Tagitilauksesi on nyt tallennettu."
@@ -4220,49 +4203,57 @@ msgstr "Aktiivinen yhden tagin alla"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Valitettavasti tämä kysymys on poistettu, eikä ole enää saatavilla"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Valitettavasti etsimäsi vastaus ei ole enää saatavilla, sillä sitä edeltävä kysymys on poistettu"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Valitettavasti tämä vastaus on poistettu eikä ole enää saatavilla"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Valitettavasti etsimäsi kommentti ei ole enää saatavilla, sillä alkuperäinen kysymys on poistettu"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "Valitettavasti etsimäsi kommentti ei ole enää saatavilla, sillä alkuperäinen vastaus on poistettu"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4284,17 +4275,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4494,19 +4485,14 @@ msgstr "Muokkaa vastausta"
msgid "back"
msgstr "takaisin"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "tarkistus"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Tallenna muokkaus"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4514,21 +4500,21 @@ msgstr "Tallenna muokkaus"
msgid "Cancel"
msgstr "Peruuta"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "piilota esikatselu"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "näytä esikatselu"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4541,11 +4527,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4638,7 +4623,7 @@ msgstr "hopeamitali: myönnetään erittäin korkealaatuisesta panoksesta"
msgid "bronze badge: often given as a special honor"
msgstr "pronssimitali: annetaan usein erikoiskunniana"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5123,61 +5108,61 @@ msgstr "äänien määrä nyt"
msgid "anonymous user"
msgstr "anonyymi käyttäjä"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "kysytty"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "vastattu"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "lisätty"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "tämä merkintä on merkitty yhteisöwikiksi"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Tämä viesti on wiki.\nKäyttäjät, joilla on mainepisteitä yli >%(wiki_min_rep)s voivat parantaa sitä."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "päivitetty"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "katso kysymyksiä, joilla on tagi '%(tag)s'"
@@ -5186,87 +5171,87 @@ msgstr "katso kysymyksiä, joilla on tagi '%(tag)s'"
msgid "delete this comment"
msgstr "poista kommentti"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "muokkaa"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "seuraa %(alias)s:ta"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "lopeta %(alias)s:n seuraaminen"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "seurataan %(alias)s:ta"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "käyttäjän %(username)s gravatar-kuva"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "Käyttäjän %(username)s nettisivu on %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "edellinen"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "nykyinen sivu"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "seuraava sivu"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "vastauksia käyttäjälle %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "ei vastauksia"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s uutta liputettua merkintää ja %(seen)s jo nähtyä"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s uutta liputettua merkintää"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s jo nähtyä liputettua merkintää"
@@ -5275,23 +5260,23 @@ msgstr "%(seen)s jo nähtyä liputettua merkintää"
msgid "Questions"
msgstr "Kysymykset"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Vastaa omaan kysymykseesi"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5299,7 +5284,15 @@ msgstr ""
msgid "Edit question"
msgstr "Muokkaa kysymystä"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5383,66 +5376,66 @@ msgstr "Tilaa"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Käyttäjät"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Lajittele »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "katso maineikkaimpia käyttäjiä"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "mainepisteet"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "katso viimeiseksi liittyneitä"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "äskettäiset"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "katso ensin liittyneitä"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "katso nimen mukaan lajiteltuna"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "käyttäjänimen mukaan"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Mitään ei löytynyt."
@@ -5463,97 +5456,29 @@ msgid "Sign in"
msgstr "Kirjaudu sisään"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Tallenna sähköpostiosoitteesi"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Tallenna sähköpostiosoite"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Tarkistuta sähköpostiosoite"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Sähköpostia ei vaihdettu"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Sähköposti muutettu"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Sähköpostiosoite hyväksytty"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5562,19 +5487,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Rekisteröinti"
@@ -5745,7 +5657,7 @@ msgid "Login or email"
msgstr "Sisäänkirjautuminen tai sähköposti"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Salasana"
@@ -5764,6 +5676,12 @@ msgstr "Uusi salasana"
msgid "Please, retype"
msgstr "Kirjoita uudelleen"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Vaihda salasana"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6069,7 +5987,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6092,22 +6010,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6136,10 +6062,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6154,10 +6076,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6246,7 +6164,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Sivustot"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Korjaa allaolevat virhe:"
+msgstr[1] "Korjaa allaoleva virheet:"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Asetukset sisältyvät %(name)s:iin"
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Ei oikeuksia"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Dokumentaatio"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Kirjaudu ulos"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Koti"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Muokkaa sivuston asetuksia"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Live-asetukset eivät ole käytössä tällä sivulla"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Kokoonpanoasetuksia voi muokata vain sivun settings.py-tiedostossa"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Ryhmäasetukset: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Luhista kaikki"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6334,8 +6310,8 @@ msgid "Did not find what you were looking for?"
msgstr "Et löytänyt etsimääsi?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Ole hyvä ja kysy kysymyksesi!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6381,7 +6357,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "käytä enintään %(tag_count)s tagiä, kukin enintään %(max_chars)s merkin pituinen"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6744,7 +6720,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6879,6 +6855,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6990,24 +6995,24 @@ msgstr "nähty viimeksi"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "paikka"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "ikä"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "tämän päivän käyttämättömät äänet"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "ääntä jäljellä"
@@ -7105,20 +7110,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] "%(count)s seuraaja"
msgstr[1] "%(count)s seuraajaa"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "Seuraa %(count)s käyttäjää"
msgstr[1] "Seuraa %(count)s käyttäjää"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Verkostosi on tyhjä. Haluaisitko seurata jotakuta? Käy jonkun profiilissa ja klikkaa \"seuraa\"!"
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "Käyttäjän %(username)s verkosto on tyhjä"
@@ -7218,7 +7223,7 @@ msgstr "Vastaa kysymykseen:"
msgid "User profile"
msgstr "Profiili"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "kommentteja ja vastauksia muihin kysymyksiin"
@@ -7234,7 +7239,7 @@ msgstr ""
msgid "questions that user is following"
msgstr "kysymykset, joita käyttäjä seuraa"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "äänihistoria"
@@ -7243,11 +7248,11 @@ msgstr "äänihistoria"
msgid "votes"
msgstr "äänet"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "sähköpostin tilausasetukset"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "hallitse tätä käyttäjää"
@@ -7268,7 +7273,15 @@ msgstr "yritä ennemmin vastata kysymykseen kuin uppoutua keskusteluun"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7276,23 +7289,23 @@ msgstr ""
msgid "Contributors"
msgstr "Yhteisön jäseniä"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(pakollinen)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Reaaliaikainen Markdown-muokkain päälle/pois"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7563,23 +7576,23 @@ msgstr "asetukset"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Hups, anteeksi - tapahtui virhe"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Kirjadu sisään lisätäksesi merkintöjä"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "Sähköpostistasi löydettiin roskapostia, anteeksi, jos huomio oli virheellinen"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7643,38 +7656,38 @@ msgstr "tämä sähköpostiosoite on jo käytössä"
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "salasana vaaditaan"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "anna salasana uudestaan"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "lisäämäsi salasanat eivät vastanneet toisiaan, yritä uudelleen"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "kaksi päivää sitten"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "eilen"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "%(hr)d tunti sitten"
msgstr[1] "%(hr)d tuntia sitten"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7733,46 +7746,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "sähköpostien päivitysväli on vaihdettu päivittäiseksi"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "Tagitilaus peruttiin (peru)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Kirjaudu sisään kirjoittautuaksesi %(tags)s:n tilaajaksi"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Kirjaudu sisään äänestääksesi"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7801,113 +7818,113 @@ msgstr "Odotamme palautettasi, annathan palautetta ensi kerralla! :)"
msgid "Privacy policy"
msgstr "Yksityisyydensuoja"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Valitettavasti etsimäsi kommentti on poistettu eikä ole enää saatavilla"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "hallitse käyttäjää"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "käyttäjäprofiili"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "käyttäjäprofiilin yhteenveto"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "viimeisimmät"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profiili - viimeisimmät"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profiili - vastaukset"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profiili - äänet"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "käyttäjien suosikit"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profiili - suosikkikysymykset"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "muutokset talletettu"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "sähköpostipäivitykset peruttu"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profiili - sähköpostitilaukset"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Valitettavasti anonyymit käyttäjät eivät voi ladata tiedostoja"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "hyväksytyt tiedostotyypit ovat '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "Ladattavan tiedoston enimmäiskoko on %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Virhe tiedostoa ladatessa. Ole hyvä ja ota yhteyttä sivun ylläpitoon. Kiitos."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7916,45 +7933,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Kirjautu sisään vastataksesi kysymyksiin"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Valitettavasti et ole kirjautunut sisään, etkä voi lisätä kommentteja. Ole hyvä ja kirjaudu sisään."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Valitettavasti anonyymit käyttäjät eivät voi muokata kommentteja"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Valitettavasti et ole kirjautunut sisään, etkä voi poistaa kommentteja. Ole hyvä ja kirjaudu sisään."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "anteeksi, meillä näyttää olevan teknisiä vaikeuksia"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/fi/LC_MESSAGES/djangojs.po b/askbot/locale/fi/LC_MESSAGES/djangojs.po
index 1c093b12..a79712a6 100644
--- a/askbot/locale/fi/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/fi/LC_MESSAGES/djangojs.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Hannu Sehm
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Kirjoita tähän kysymyksen otsikko (>10 merkkiä)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -497,202 +501,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "sulje klikkaamalla"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -755,7 +763,7 @@ msgstr "vaakasuora palkki"
msgid "undo"
msgstr "peruuta"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "tee uudelleen"
@@ -771,15 +779,15 @@ msgstr "Anna URL-osoite, esim. http://www.example.com \"sivun otsikko\""
msgid "upload file attachment"
msgstr "Valitse ja lataa tiedosto:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/fr/LC_MESSAGES/django.po b/askbot/locale/fr/LC_MESSAGES/django.po
index 40b09481..880e76f3 100644
--- a/askbot/locale/fr/LC_MESSAGES/django.po
+++ b/askbot/locale/fr/LC_MESSAGES/django.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-05-08 13:30+0000\n"
-"Last-Translator: Christophe kryskool python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Attention: après avoir cocher ceci, veuillez sauvegarder votre base de données, et lancer la commande d'administration: python manage.py fix_question_tags
pour renommer les étiquettes globalement"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Format de la liste des étiquettes"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Sélectionner le format pour montrer les étiquettes, comme une simple liste ou un nuage"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Étiquettes"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Nombre de commentaires maximal par défaut à afficher en dessous du message"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "La longueur maximale du commentaire , doit être < %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Temps limité pour éditer un commentaire"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Si non coché, il n'y a pas de limite de temps pour éditer un commentaire "
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Nombre de minutes autoriser pour éditer un commentaire"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Pour activer ce paramètre, veuiller vérifier le précédent"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Désolé, votre question ne peut pas être poster par insuffisance de privilèges de votre compte utilisateur
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Accepter la meilleure réponse pour %(question_count)d de vos questions" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Veuillez accepter la meilleur réponse pour cette question:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Veuillez accepter la meilleur réponse pour ces questions" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "%(question_count)d question mise à jour à propos de %(topics)s" msgstr[1] "%(question_count)d questions mises à jour à propos de %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3458,11 +3441,11 @@ msgid_plural "" msgstr[0] "
Cher %(name)s,
La question suivante a été mise à jour %(sitename)s
" msgstr[1] "Cher %(name)s,
Les %(num)d questions suivantes ont été mise à jour sur %(sitename)s:
" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "nouvelle question" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3485,86 +3468,86 @@ msgstr[1] "%(question_count)d questions sans réponse à propos de %(topics)s"
msgid "Please log in to use %s"
msgstr "Veuillez vous connecter pour utiliser %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Désolé, vous ne pouvez pas accepter ou refuser les meilleures réponses car votre compte est bloqué"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Désolé, vous ne pouvez pas accepter ou refuser les meilleures réponses car votre compte est suspendu"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Désolé, vous ne pouvez accepter la réponse qu'après %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Désolé, seuls les modérateurs ou l'auteur de cette question - %(username)s peut accepter ou refuser la meilleure réponse"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr "Désolé, vous ne pouvez pas voter pour votre propre réponse"
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Désolé, votre compte semble être bloqué"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Désolé, votre compte semble être suspendu"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ">%(points)s points sont requis pour pouvoir voter positivement"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s points sont requis pour pouvoir voter négativement"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Désolé, les utilisateurs bloqués ne peuvent pas transférer de fichier"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Désolé, les utilisateurs suspendus ne peuvent pas transférer de fichier"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr "désolé, l'envoi de fichier requière un aura > %(min_rep)s"
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3575,57 +3558,57 @@ msgid_plural ""
msgstr[0] "Désolé, les commentaires (à pars le dernier) sont seulement modifiables pendant les %(minutes)s minutes après l'envoi"
msgstr[1] "Désolé, les commentaires (à pars le dernier) sont seulement modifiables pendant les %(minutes)s minutes après l'envoi"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Désolé, seuls les propriétaires des questions ou les modérateurs peuvent modifier les commentaires"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Désolé, vous ne pouvez commenter que vos propres publications, car votre compte est suspendu"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Désolé, pour commenter des publications, un minimum de %(min_rep)s points de réputation est requis. Vous pouvez toutefois commenter vos propres publications et répondre à vos questions"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Ce message a été supprimé et ne peut être vu que par les propriétaires du message, les administrateurs du site et les modérateurs"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Désolé, seuls les modérateurs, les administrateurs du site et les propriétaires des messages peuvent modifier les messages supprimés"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Désolé, vous ne pouvez pas modifier de messages, car votre compte est bloqué"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Désolé, vous ne pouvez modifier que vos propres messages, car votre compte est suspendu"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Désolé, pour modifier les messages du wiki, un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Désolé, pour éditer les messages des autres utilisateurs, un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3635,103 +3618,103 @@ msgid_plural ""
msgstr[0] "Désolé, impossible de supprimer votre question car elle a obtenu un vote positif de la part d'un autre utilisateur"
msgstr[1] "Désolé, impossible de supprimer votre question car elle a obtenu des votes positifs de la part d'autres utilisateurs"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Désolé, vous ne pouvez pas supprimer de messages car votre compte est bloqué"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Désolé, vous pouvez seulement supprimer vos propres messages car votre compte est suspendu"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Désolé, vous ne pouvez pas cloturer de questions car votre compte est bloqué"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Désolé, vous ne pouvez pas cloturer de questions car votre compte est suspendu"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Désolé, pour cloturer les messages des autres utilisateurs, un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Désolé, pour clore vos propres questions, un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Désolé, seuls les administrateurs, les modérateurs et les propriétaires des messages avec plus de %(min_rep)s points de réputation peuvent réouvrir des questions."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Désolé, pour réouvrir vos propres questions, un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr "Vous avez déjà étiqueter cette question avant et vous ne pouvez pas le faire plus d'une fois"
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "Impossible de supprimer un étiquette non existante"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr "Désolé, depuis que votre compte est bloqué vous ne pouvez pas retirer de drapeaux"
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3739,221 +3722,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "vous n'avez pas les permissions de supprimer toutes les étiquettes"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "pas d'étiquette pour cette entrée"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Désolé, seuls les propriétaires des questions, les administrateurs du site et les modérateurs peuvent requalifier des questions supprimées (c'est à dire modifier leurs mots-clés)"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Désolé, vous ne pouvez pas requalifier une question (c'est à dire changer ses mots-clés) car votre compte est bloqué"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Désolé, vous pouvez seulement requalifier vos propres questions (c'est à dire changer leurs mots-clés) car votre compte est suspendu"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Désolé, pour requalifier une question (c'est à dire changer ses mots-clés), un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Désolé, vous ne pouvez pas supprimer de commentaires car votre compte est bloqué"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Désolé, vous pouvez seulement supprimer vos propres commentaires car votre compte est suspendu"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Désolé, pour supprimer des commentaires, un minimum de %(min_rep)s points de réputation est requis"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "le %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "dans deux jours"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "demain"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "dans %(hr)d heure"
msgstr[1] "dans %(hr)d heures"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "dans %(min)d min"
msgstr[1] "dans %(min)d mins"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d jour"
msgstr[1] "%(days)d jours"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Nouveaux utilisateurs doivent attendre %(days)s avant de poser leur propre question. Vous pouvez publier une réponse %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anonyme"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administrateur du site"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Modérateur de forum"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Utilisateur suspendu"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Utilisateur bloqué"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Utilisateur enregistré"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Utilisateurs suivis"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Utilisateur certifié"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "Le karma de %(username)s est de %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "une médaille d'or"
msgstr[1] "%(count)d médailles d'or"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "une médaille d'argent"
msgstr[1] "%(count)d médailles d'argent"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "une médaille de bronze"
msgstr[1] "%(count)d médailles de bronze"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s et %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s a %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Félicitations, vous avez reçu un badge '%(badge_name)s'. Consultez votre profil."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Votre soumission de mot clé a été sauvegardé, merci!"
@@ -4223,49 +4206,57 @@ msgstr "Très actif dans une catégorie de questions"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Désolé, cette question a été supprimée, et n'est plus accessible."
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Désolé, la réponse que vous cherchez n'est plus disponible, car la question dont elle dépend a été supprimée"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Désolé, cette réponse a été supprimée et n'est plus accessible"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Désolé, le commentaire que vous cherchez n'est plus accessible, car la question dont il dépend a été supprimée"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4287,17 +4278,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4497,19 +4488,14 @@ msgstr "Modifier la réopnse"
msgid "back"
msgstr "Retour"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "Version"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Enregistrer les modifications"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4517,21 +4503,21 @@ msgstr "Enregistrer les modifications"
msgid "Cancel"
msgstr "Annuler"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "Masquer l'aperçu"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "Afficher l'aperçu"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr "Poser votre question"
@@ -4544,11 +4530,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4641,7 +4626,7 @@ msgstr "badge en argent: occasionnellement donné pour des contributions de trè
msgid "bronze badge: often given as a special honor"
msgstr "Badge bronze - blah blah"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5126,61 +5111,61 @@ msgstr "Nombre de votes actuel"
msgid "anonymous user"
msgstr "anonyme"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "posée"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "répondue"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "postée"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "le poste est marqué comme wiki communautraire"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "actualisée"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "Voir les questions marquées par '%(tag)s'."
@@ -5189,87 +5174,87 @@ msgstr "Voir les questions marquées par '%(tag)s'."
msgid "delete this comment"
msgstr "Supprimer ce commentaire"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "modifier"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "suivre %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "ne plus suivre %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "suivi par %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "Image Gravatar de %(username)s"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "Le site web de %(username)s est \"%(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "page précédente"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "page actuelle"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "page %(num)s"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "page suivante"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "réponses pour %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "pas de nouvelles réponses pour l'instant"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s nouveaux messages étiquetés"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s messages taggés"
@@ -5278,23 +5263,23 @@ msgstr "%(seen)s messages taggés"
msgid "Questions"
msgstr "Questions"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr "Poster un commentaire"
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Répondre à votre propre question"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr "Poser votre question"
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr "S'identifier/s'aboner pour poster"
@@ -5302,7 +5287,15 @@ msgstr "S'identifier/s'aboner pour poster"
msgid "Edit question"
msgstr "Modifier une question"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5386,66 +5379,66 @@ msgstr "S'abonner"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Utilisateurs"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Trier par »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "voir les personnes avec une réputation élevée"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "aura"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "voir les personnes qui nous ont rejoint récemment"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "récent"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "voir les personnes triés par leur nom"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "par nom d'utilisateur"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Aucun résultat."
@@ -5466,97 +5459,29 @@ msgid "Sign in"
msgstr "S'identifier"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "Changer de courriel"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Sauvegarder votre adresse email"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Sauvegarder l'email"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Valider l'email"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Email inchangé"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Adresse email modifiée."
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Adresse email vérifiée."
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5565,19 +5490,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr "Le courriel de validation n'a pas été envoyé"
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Enregistrement"
@@ -5748,7 +5660,7 @@ msgid "Login or email"
msgstr "Identifiant ou email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Mot de passe"
@@ -5767,6 +5679,12 @@ msgstr "Nouveau mot de passe"
msgid "Please, retype"
msgstr "Veuillez le resaisir"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Changer de mot de passe"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6072,7 +5990,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6095,22 +6013,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6139,10 +6065,6 @@ msgstr "\n
Le système est incapable de traiter votre message avec succès, la
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6157,10 +6079,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6249,7 +6167,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Sites"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Merci de bien vouloir corriger l'erreur ci-dessous."
+msgstr[1] "Merci de bien vouloir corriger les erreurs ci-dessous."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Paramètrages inclus dans %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Vous n'avez pas la permission de modifier ces valeurs"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentation"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Déconnexion"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Accueil"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Modifier le paramètrage du site"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Les paramètrages \"en direct\" sont désactivés pour ce site"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Toutes le soptions de configurations doivent être modifiées dans le fichier settings.py du site"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "paramètres du groupe : %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Tout déplier"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6337,8 +6313,8 @@ msgid "Did not find what you were looking for?"
msgstr "Vous n'avez pas trouvé ce que vous cherchiez ?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Veuillez saisir votre question !"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6384,7 +6360,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6747,7 +6723,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6882,6 +6858,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6993,24 +6998,24 @@ msgstr "dernière connexion"
msgid "website"
msgstr "Site internet"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "Lieu"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "Age"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "Votes non utilisés aujourd'hui"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "votes restants"
@@ -7108,20 +7113,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] "Suivi par %(count)s personne"
msgstr[1] "Suivi par %(count)s personnes"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7221,7 +7226,7 @@ msgstr "Répondre à:"
msgid "User profile"
msgstr "Profil utilisateur"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "Commentaires et réponses à d'autres questions"
@@ -7237,7 +7242,7 @@ msgstr "Graphique de l'aura de l'utilisateur"
msgid "questions that user is following"
msgstr "Les questions que cet utilisateur suit"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "Trace des votes de cet utilisateur"
@@ -7246,11 +7251,11 @@ msgstr "Trace des votes de cet utilisateur"
msgid "votes"
msgstr "votes"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "Paramètres d'abonnement aux emails"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "Modérer cet utilisateur"
@@ -7271,7 +7276,15 @@ msgstr "Contentez-vous de donner une réponse, plutôt que de vous engagez dans
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7279,23 +7292,23 @@ msgstr ""
msgid "Contributors"
msgstr "Contributeurs"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "étiquettes:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(obligatoire)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Basculer vers l'aperçu avec éditeur temps-réel"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7566,23 +7579,23 @@ msgstr "paramètres"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "non"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Oups, désolé - une erreur s'est produite"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Veuillez vous identifier pour poster"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "Du spam a été détecter dans votre message, désolé si ceci est une erreur"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7646,38 +7659,38 @@ msgstr "Cette adresse email est déjà utilisée par un autre utilisateur; veuil
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "le mot de passe est obligatoire"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "Mot de passe (veuillez resaisir)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "Merci de resaisir votre mot de passe"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "désolé, les 2 mots de passe sont différents, veuillez recommencer"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "il y a 2 jours"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "hier"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "il y a %(hr)d heure"
msgstr[1] "il y a %(hr)d heures"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7736,46 +7749,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "La fréquence d'envoi des emails de notification de mises à jour est désormais \"quotidienne\"."
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Veuillez vous identifier pour vous désincrire de: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Veuillez vous identifier pour voter"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "Veuillez vous inscrire pour supprimer/récupérer une publication"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7804,113 +7821,113 @@ msgstr "Nous aimerions bien savoir ce que vous pensez de notre service de questi
msgid "Privacy policy"
msgstr "Politique en matière de respect de la vie privée"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Désolé, le commentaire que vous cherchez a été supprimé, et n'est plus accessible."
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "utilisateur modéré"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "profil de l'utilisateur"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "infOs générales sur le profil de l'utilisateur"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "activité récente de l'utilisateur"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profil - activité récente"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profil - réactions"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profil - votes"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "karma utilisateur"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "Profil - aura de l'utilisateur"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "questions favorites des utilisateurs"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profil - questions favorites"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "Modifications enregistrées."
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "Modification(s) d'email(s) annulée(s)"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profil - abonnements emails"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Désolé, les utilisateurs anonymes ne peuvent pas transférer de fichiers"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "Les types de fichiers autoprisés sont '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "La taille maximale autorisée pour un fichier est de %(file_size)s Kilo-octets"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Une erreur est survenue lors du transfert du fichier sur notre serveur. Merci de contacter l'administrateur."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7919,45 +7936,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Veuillez vous connecter pour répondre à une question"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Désolé, vous ne pouvez pas publier de commentaires car vous semblez être déconnecté. Merci d'essayer de vous reconnecter."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Désolé, les utilisateurs aonymes ne peuvent pas éditer de commentaires"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Désolé, vous ne pouvez pas supprimer de commentaires car vous semblez être déconnecté. Merci d'essayer de vous reconnecter."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Désolé, nous rencontrons apparemment des difficultés d'ordre techniques..."
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/fr/LC_MESSAGES/djangojs.po b/askbot/locale/fr/LC_MESSAGES/djangojs.po
index 9cc59186..7a42fbb4 100644
--- a/askbot/locale/fr/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/fr/LC_MESSAGES/djangojs.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Christophe kryskool
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Veuillez entrer le titre de la question (>10 caractères)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -497,202 +501,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "cliquer pour fermer"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -755,7 +763,7 @@ msgstr "barre horizontale"
msgid "undo"
msgstr "défaire"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "refaire"
@@ -771,15 +779,15 @@ msgstr "saisir une adresse web, par example http://www.example.com \"titre de la
msgid "upload file attachment"
msgstr "Merci de choisir un fichier et de le télécharger vers le serveur:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/hi/LC_MESSAGES/django.po b/askbot/locale/hi/LC_MESSAGES/django.po
index 9dbb0de4..05c35156 100644
--- a/askbot/locale/hi/LC_MESSAGES/django.po
+++ b/askbot/locale/hi/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Chandan kumar python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "ध्यान दें: इस जाँच के बाद, कृपया डेटाबेस के बैकअप करे , और एक प्रबंधन कमांड चलाएँ: python manage.py fix_question_tags
टैग को ग्लोबली पुनःनामकरण करे "
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "टैग सूची का प्रारूप"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "प्रारूप का चयन या तो एक साधारण सूची के रूप या एक टैग क्लौड में, करके टैग को दिखाएं"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "वाइल्डकार्ड टैग का प्रयोग करें"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "वाइल्डकार्ड टैग का इस्तेमाल अनुसरण करने या कई टैग की अनदेखी करने के लिए किया जा सकता है,वैध वाइल्डकार्ड टैग के सबसे अंत में एकल वाइल्डकार्ड होता है."
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "प्रविष्टियाँ के तहत प्रदर्शित करने के लिए टिप्पणी की डिफ़ॉल्ट रूप से अधिकतम संख्या"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "अधिकतम टिप्पणी की लंबाई < %(max_len)s हो सकती है."
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "टिप्पणियों के संपादित करने के लिए समय सीमा"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "अगर अनियंत्रित हो तो , वहाँ कोई भी समय सीमा से टिप्पणी संपादित हो सकता है "
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "कार्यवृत्त तक कोई टिप्पणी संपादित को करने की अनुमति"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "इस सेटिंग को सक्षम करने के लिए, पिछले जाँच करें"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3453,11 +3436,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3480,86 +3463,86 @@ msgstr[1] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ""
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ""
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3570,57 +3553,57 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3630,103 +3613,103 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3734,221 +3717,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr ""
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr ""
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr ""
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr ""
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4218,49 +4201,57 @@ msgstr ""
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4282,17 +4273,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4492,19 +4483,14 @@ msgstr ""
msgid "back"
msgstr ""
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr ""
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr ""
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4512,21 +4498,21 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr ""
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr ""
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4539,11 +4525,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4636,7 +4621,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr ""
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5121,61 +5106,61 @@ msgstr ""
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr ""
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr ""
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr ""
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5184,87 +5169,87 @@ msgstr ""
msgid "delete this comment"
msgstr ""
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr ""
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr ""
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr ""
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr ""
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr ""
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5273,23 +5258,23 @@ msgstr ""
msgid "Questions"
msgstr ""
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr ""
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5297,7 +5282,15 @@ msgstr ""
msgid "Edit question"
msgstr ""
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5381,66 +5374,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr ""
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr ""
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr ""
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr ""
@@ -5461,97 +5454,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr ""
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr ""
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5560,19 +5485,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5743,7 +5655,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr ""
@@ -5762,6 +5674,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr ""
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6067,7 +5985,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6090,22 +6008,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6134,10 +6060,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6152,10 +6074,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6244,7 +6162,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6332,7 +6308,7 @@ msgid "Did not find what you were looking for?"
msgstr ""
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
+msgid "Ask your question!"
msgstr ""
#: templates/main_page/tab_bar.html:11
@@ -6379,7 +6355,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6742,7 +6718,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6877,6 +6853,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6988,24 +6993,24 @@ msgstr ""
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr ""
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr ""
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr ""
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr ""
@@ -7103,20 +7108,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7216,7 +7221,7 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr ""
@@ -7232,7 +7237,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr ""
@@ -7241,11 +7246,11 @@ msgstr ""
msgid "votes"
msgstr ""
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr ""
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7266,7 +7271,15 @@ msgstr ""
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7274,23 +7287,23 @@ msgstr ""
msgid "Contributors"
msgstr ""
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr ""
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr ""
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7561,23 +7574,23 @@ msgstr ""
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7641,38 +7654,38 @@ msgstr ""
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr ""
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr ""
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr ""
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr ""
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr ""
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7731,46 +7744,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr ""
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7799,113 +7816,113 @@ msgstr ""
msgid "Privacy policy"
msgstr ""
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr ""
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr ""
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr ""
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr ""
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr ""
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr ""
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr ""
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr ""
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr ""
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr ""
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr ""
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7914,45 +7931,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/hi/LC_MESSAGES/djangojs.po b/askbot/locale/hi/LC_MESSAGES/djangojs.po
index ba32b2ea..9465a7f4 100644
--- a/askbot/locale/hi/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/hi/LC_MESSAGES/djangojs.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Chandan kumar
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "प्रश्न के शीर्षक (>10 अक्षर) दर्ज करें"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -496,202 +500,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "बंद करने के के लिए क्लिक करें"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -754,7 +762,7 @@ msgstr "क्षैतिज पट्टी"
msgid "undo"
msgstr "पूर्ववत् करें"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "फिर से करे "
@@ -770,15 +778,15 @@ msgstr "वेब पता प्रविष्ट करें जैसे:h
msgid "upload file attachment"
msgstr "कृपया चुनें और फ़ाइल को अपलोड करें:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/hr/LC_MESSAGES/django.po b/askbot/locale/hr/LC_MESSAGES/django.po
index 9060dfaf..ef8ba01b 100644
--- a/askbot/locale/hr/LC_MESSAGES/django.po
+++ b/askbot/locale/hr/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Evgeny Fadeev python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Pozor: nakon što ovo označite, napravite kopiju baze podataka i pokrenite komandu: python manage.py fix_question_tags
za globalnu promjenu naziva oznaka"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Format liste oznaka"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Odaberite format prikaza oznaka u obliku jednostavne liste ili oblaka oznaka"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Koristi višeznačne oznake"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Višeznačne oznake se mogu koristiti za praćenje ili ignoriranje više oznaka odjednom, ispravna višeznačna oznaka ima jedan višeznačnik na samom kraju"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Zadan maksimalan broj komentara prikazanih ispod postova"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Maksimalna duljina komentara mora biti < %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Ograniči vrijeme za uređivanje komentara"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Ako nije označeno, vrijeme za uređivanje komentara neće biti ograničeno"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Dozvoljen broj minuta za uređivanje komentara"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Za omogućavanje ove postavke označite prethodni"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Vaše pitanje nije objavljeno zbog nedovoljnih prava vašeg korisničkog računa
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Prihvati najbolji odgovor za %(question_count)d vaših pitanja" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Prihvatite najbolji odgovor za ovo pitanje:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Prihvatite najbolji odgovor za ova pitanja:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" @@ -3450,7 +3432,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3462,11 +3444,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "novo pitanje" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3490,86 +3472,86 @@ msgstr[2] ""
msgid "Please log in to use %s"
msgstr "Za korištenje %s potrebna je prijava"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Ne možete prihvatiti ili odbiti najbolji odgovor jer je vaš račun blokiran"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Ne možete prihvatiti ili odbiti najbolji odgovor jer je vaš račun suspendiran"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr "Potrebno je >%(points)s bodova za prihvaćanje ili odbijanje svojeg odgovora na svoje pitanje "
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Biti ćete u mogućnosti prihvatiti ovaj odgovor nakon %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Samo moderatori ili autor pitanja - %(username)s - može prihvatiti ili odbiti najbolji odgovor "
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr "Ne možete glasati za svoje postove"
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Izgleda da je vaš račun blokiran"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Izgleda da je vaš račun suspendiran"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "Potrebno je >%(points)s za davanje pozitivnog glasa"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "Potrebno je >%(points)s za davanje negativnog glasa"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Blokirani korisnici ne mogu slati datoteke"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Suspendirani korisnici ne mogu slati datoteke"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr "Slanje datoteka zahtjeva veličinu karme >%(min_rep)s"
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3581,57 +3563,57 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Samo vlasnici posta ili moderatori mogu uređivati komentare"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Zato što vam je račun suspendiran možete komentirati samo svoje postove"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Za komentiranje postova potrebno je imati ugled od najmanje %(min_rep)s bodova. Trenutno možete komentirati samo svoje postove i odgovore na pitanja."
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Ovaj post je obrisan, a mogu ga vidjeti samo vlasnik posta, administrator i moderatori."
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Samo moderatori, administratori i vlasnici posta mogu uređivati obrisane postove"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Ne možete uređivati postove zato što vam je račun blokiran"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Ne možete uređivati postove zato što vam je račun suspendiran"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Za uređivanje wiki postova, potreban je minimalan ugled od %(min_rep)s "
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Za uređivanje postova drugih korisnika, potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3642,103 +3624,103 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Ne možete obrisati postove jer vam je račun blokiran"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Možete brisati samo svoje postove jer vam je račun suspendiran"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Ne možete zatvoriti pitanja jer vam je račun blokiran"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Ne možete zatvoriti pitanja jer vam je račun suspendiran"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Za zatvaranje postova drugih korisnika potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Za zatvaranje svojih pitanja potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Samo administratori, moderatori i vlasnici posta sa ugledom > %(min_rep)s mogu ponovo otvoriti pitanja."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Za ponovo otvaranje svojih pitanja potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr "Već ste označili zastavom ovo pitanje i ne možete ga označiti ponovo"
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr "Ne možete označiti postove kao uvedljive jer vam je račun blokiran"
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr "Za označavanje postova uvredljivim potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr "Iscrpili ste maksimalan broj od %(max_flags_per_day)s uvredljivih zastava po danu."
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "ne mogu ukloniti nepostojeću zastavu"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr "Ne možete ukloniti zastave jer vam je račun blokiran"
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr "Ne možete ukloniti zastave jer vam je račun suspendiran. Kontaktirajte administratora foruma radi rješavanja problema."
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3747,67 +3729,67 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "nemate dozvolu za uklanjanje svih zastava"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "nema zastava na ovom unosu"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Samo vlasnici pitanja, administratori i moderatori mogu ponovo označiti obrisana pitanja"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Ne možete ponovo označiti pitanja jer vam je račun blokiran"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Ne možete ponovo označiti pitanja jer vam je račun suspendiran"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Za ponovo označavanje pitanja potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Ne možete obrisati komentar jer vam je račun blokiran"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Ne možete obrisati svoje komentare jer vam je račun suspendiran"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Za brisanje komentara potreban je minimalan ugled od %(min_rep)s"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr "stari glasovi se ne mogu opozvati"
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "na %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "za dva dana"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "sutra"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
@@ -3815,7 +3797,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
@@ -3823,7 +3805,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
@@ -3831,51 +3813,51 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Novi korisnici mogu odgovaranje na svoje pitanje nakon %(days)s dana. Možete objaviti odgovor %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anoniman"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administartor"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Forum Moderator"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Suspendiran Korisnik"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Blokiran Korisnik"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Registrian Korisnik"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Korisnik pod Smotrom"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Odobren Korisnik"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s karma je %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
@@ -3883,7 +3865,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
@@ -3891,7 +3873,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
@@ -3899,17 +3881,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s i %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s ima %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
@@ -3917,58 +3899,58 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Čestitamo, dobili ste značku '%(badge_name)s'. Provjerite vaš profil."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Vaša pretplata na oznaku je sačuvana, hvala!"
@@ -4238,49 +4220,57 @@ msgstr "Vrlo aktivan u jednoj oznaci"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Ovo pitanje je obrisano i više nije dostupno."
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Odgovor koji tražite više nije dostupan zato što je roditeljsko pitanje obrisano"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Ovaj odgovor je obrisan i više nije dostupan"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Komentar koji tražite više nije dostupan zato što je roditeljsko pitanje obrisano"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "Komentar koji tražite više nije dostupan zato što je roditeljski odgovor obrisan"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4303,17 +4293,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4513,19 +4503,14 @@ msgstr "Uredi odgovor"
msgid "back"
msgstr "nazad"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revizija"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Sačuvaj uređeno"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4533,21 +4518,21 @@ msgstr "Sačuvaj uređeno"
msgid "Cancel"
msgstr "Odustani"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "sakri prikaz"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "pokaži prikaz"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr "Postavi Pitanje"
@@ -4560,11 +4545,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4658,7 +4642,7 @@ msgstr "srebrna značka: daje se povremeno za vrlo kvalitetan doprinos"
msgid "bronze badge: often given as a special honor"
msgstr "brončana značka: često se daje kao posebna čast"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5143,61 +5127,61 @@ msgstr "trenutan broj glasova"
msgid "anonymous user"
msgstr "anonimni korisnik"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "pitano"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "odgovoreno"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "objavljeno"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "ovaj post je označen kao wiki zajednica"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Ovaj post je wiki.\n Svatko sa >%(wiki_min_rep)s karmom može ga unaprijediti."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "ažurirano"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "pogledajte pitanja označena sa '%(tag)s'"
@@ -5206,66 +5190,66 @@ msgstr "pogledajte pitanja označena sa '%(tag)s'"
msgid "delete this comment"
msgstr "obriši ovaj komentar"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "uredi"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "prati %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "prestani pratiti %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "pratim %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s gravatar slika"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "%(username)s internet stranica je %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "prethodni"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "trenutna stranica"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "stranica %(num)s"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "sljedeća stranica"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "odazivi za %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
@@ -5273,21 +5257,21 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "nema novih odaziva"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s novih postova sa zastavom i %(seen)s prethodnih"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s novih postova sa zastavom"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s postova sa zastavom "
@@ -5296,23 +5280,23 @@ msgstr "%(seen)s postova sa zastavom "
msgid "Questions"
msgstr "Pitanja"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr "objavi komentar"
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Odgovorite na Svoje Pitanje"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr "Objavite Svoj Odgovor"
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr "Prijava/Upis za Objavu"
@@ -5320,7 +5304,15 @@ msgstr "Prijava/Upis za Objavu"
msgid "Edit question"
msgstr "Uredi pitanje"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5404,66 +5396,66 @@ msgstr "Pretplatite se"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "People"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Sortiraj po"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "korisnici sa najvećim ugledom"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "karma"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "najnoviji korisnici "
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "najnoviji"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "najstariji korisnici"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "korisnici sortirani po imenu"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr " korisničkom imenu"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Ništa nije pronađeno."
@@ -5484,97 +5476,29 @@ msgid "Sign in"
msgstr "Prijavi me"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "Promjeni Email"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Spremi email adresu"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr "Unesite vašu novu email adrestu ispod ako \nako želite koristiti drugu email adresu za ažuriranje pretplata.\n
Trenutno koristite %%(email)s"
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr "Unesite vašu email adresu ispod.\nIspravna email adresa potrebna je za P&O forum. Ako želite, \nmožete primati dopune interesantnih pitanja ili cijelog\nforuma putem emaila. Također vaš email se koristi za kreiranje jedinstvene \ngravatar slike za vaš\nračun. Email adrese se ne prikazuju niti dijele s drugima"
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr "Vaš novi Email: \n(neće biti prikazan nikome, mora biti ispravan)"
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Spremi Email"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Potvrdi email"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr "Poslan vam je email s potvrdnom vezom \n%%(email)s. Otvorite vezu u emailu sa \nsa preglednikom. Potvrda je potrebna radi uvjeravanja u ispravno korištenje\nemaila u P&O. Ako želite koristiti \ndrugi email, promjenite ga ponovo."
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Email nije promjenjen"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr "Vaša email adresa %%(email)s nije promijenjena.\n Ako je kasnije odlučite promijeniti - to možete učinit \nu promjenom vašeg korisničkog profila ili korištenjem prethodnog obrasca ponovo."
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Email je promjenjen"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr "\nVaša email adresa je promijenjena u %%(email)s. \nDopune pitanja biti će poslane na ovu email adresu. \nEmail napomene se šalju jednom dnevno - samo kad ima novosti. "
+"href='%(change_email_url)s'>change it again."
+msgstr ""
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email potvrđen"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5583,19 +5507,6 @@ msgid ""
"or less frequently."
msgstr "Hvala na potvrdi emaila! Sada \nmožete postaviti i odgovarati na pitanja. \nAko nađete interesantno pitanje možete se pretplatiti na dopune \npitanja - o promjenama ćete biti obaviješteni jednom dnevno\nili manje učestalo."
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr "Potvrdni email nije poslan"
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr "Vaša trenutna email adresa %%(email)s je \nveć potvrđena stoga nije poslan novi ključ. Ako je potrebno možete promijeniti email za ažuriranje \npretplata."
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Registracija"
@@ -5766,7 +5677,7 @@ msgid "Login or email"
msgstr "Korisničko ime ili email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Lozinka"
@@ -5785,6 +5696,12 @@ msgstr "Nova lozinka"
msgid "Please, retype"
msgstr "Ponovo unesite"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Promjeni lozinku"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6090,7 +6007,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6114,22 +6031,30 @@ msgstr[2] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6158,10 +6083,6 @@ msgstr "\n
Sistem nije uspješno obradio vašu poruku zbog:
\n"
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6176,10 +6097,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6268,7 +6185,66 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Internet stranice"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Postavke uključene u %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Nemate dozvolu za uređivanje vrijednosti."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Odjava"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Početna"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Uredi Postavke Stranice"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Instant postavke su nisu moguće za ovu stranicu."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Sve konfiguracijske mogućnosti moraju se urediti u settings.py datoteci"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Postavke za grupu: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Složi sve"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6357,8 +6333,8 @@ msgid "Did not find what you were looking for?"
msgstr "Niste pronašli što ste tražili?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Objavite vaše pitanje!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6406,7 +6382,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "koristite do %(tag_count)s oznaka, manje od %(max_chars)s znakova za svaku"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6771,7 +6747,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6906,6 +6882,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -7017,24 +7022,24 @@ msgstr "zadnji put viđen"
msgid "website"
msgstr "internet stranica"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "lokacija"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "dob"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "dnevni glasovi"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "glasova preostalo"
@@ -7133,7 +7138,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
@@ -7141,13 +7146,13 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Vaša mreža je prazna. Želite li pratiti nekoga? Posjetite profil drugog korisnika i kliknite \"prati\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "%(username)s mreža je prazna"
@@ -7253,7 +7258,7 @@ msgstr "Odgovor na:"
msgid "User profile"
msgstr "Korisnički profil"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "komentari i odgovori na druga pitanja"
@@ -7269,7 +7274,7 @@ msgstr "graf korisnikove karme"
msgid "questions that user is following"
msgstr "pitanja koje korisnici prate"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "zapis glasova korisnika"
@@ -7278,11 +7283,11 @@ msgstr "zapis glasova korisnika"
msgid "votes"
msgstr "glasovi"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "postavke za email pretplate"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "uredi ugled korisnika"
@@ -7303,7 +7308,15 @@ msgstr "pokušajte dati odgovor, ne se uključiti u raspravu"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7311,23 +7324,23 @@ msgstr ""
msgid "Contributors"
msgstr "Aktivni korisnici"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ", jedno od ovoga je nužno"
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "oznake:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(nužno)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Aktiviraj/deaktiviraj prikaz Markdown uređivača u stvarnom vremenu"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7601,23 +7614,23 @@ msgstr "postavke"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "0"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Uups, oprostite - došlo je do greške"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Prijavite se za objavu posta"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "Neželjen sadržaj otkriven je u vašem postu, ispričavamo se ako je ovo greška"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7681,31 +7694,31 @@ msgstr "ovaj email adresa se već koristi, odaberite drugu"
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "lozinka je obvezna"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "Lozinka (ponovo)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "ponovo napišite vašu lozinku"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "lozinke ne odgovaraju, pokušajte ponovo"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "prije 2 dana"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "jučer"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
@@ -7713,7 +7726,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7773,46 +7786,50 @@ msgstr "Vaša pretplata je sačuvana, ali email adresa %(email)s mora biti potvr
msgid "email update frequency has been set to daily"
msgstr "učestalost email dopune je postavljena na dnevno"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "Pretplata na oznaku je otkazana (vrati)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Prijavite se za pretplatu na: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Prijavite se za glasanje"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "Prijavite se za brisanje/obnovu postova"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7841,113 +7858,113 @@ msgstr "Zanima nas vaše mišljenje! Dajte ga sljedeći put :)"
msgid "Privacy policy"
msgstr "Pravila o privatnosti"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Komentar koji tražite je obrisan i više nije dostupan"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "uredi korisnika"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "korisnički profil"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "pregled korisničkog profila"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "zadnje aktivnosti korisnika"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profil - zadnje aktivnosti"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profil - odazivi"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profil - glasovi"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "korisnikova karma"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "Profil - Korisnikova Karma"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "omiljena pitanja korisnika"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profil - omiljena pitanja"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "promjene sačuvane"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "email dopune opozvane"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profil - email pretplate"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Anonimni korisnici ne mogu postati datoteke"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "dopušteni tipovi datoteka su '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "maksimalna veličina poslane datoteke je %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Nastala je greška prilikom slanja datoteke. Kontaktirajte administratora. Hvala."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7956,45 +7973,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr "Možete početi postavljati pitanja anonimno. Nakon što predate post biti ćete preusmjereni na stranicu za prijavu/upis. Vaše pitanje biti će privremeno sačuvano i objavljeno nakon prijave. Proces prijave/upisa je jednostavan. Prijava traje oko 30 sekundi, a prvi upis oko minute."
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Prijavite se za odgovaranje na pitanja"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Niste prijavljeni stoga ne možete objavljivati komentare. Prijavite se."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Anonimni korisnici ne mogu uređivati komentare"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Niste prijavljeni stoga ne možete brisati komentare. Prijavite se."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Oprostite, imamo tehničkih poteškoća"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/hr/LC_MESSAGES/djangojs.po b/askbot/locale/hr/LC_MESSAGES/djangojs.po
index c2a0db9e..c745efa3 100644
--- a/askbot/locale/hr/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/hr/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:55+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Unesite naslov pitanja (>10 znakova)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
@@ -361,43 +365,43 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr "edit"
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -506,195 +510,199 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "kliknite za zatvaranje"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr "click to edit this comment"
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
@@ -702,7 +710,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -766,7 +774,7 @@ msgstr "horizontalna linija"
msgid "undo"
msgstr "vratiti"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "ponovo učiniti"
@@ -782,15 +790,15 @@ msgstr "enter Web address, e.g. http://www.example.com \"page title\""
msgid "upload file attachment"
msgstr "Please choose and upload a file:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/hu/LC_MESSAGES/django.po b/askbot/locale/hu/LC_MESSAGES/django.po
index d03e998f..1f453997 100644
--- a/askbot/locale/hu/LC_MESSAGES/django.po
+++ b/askbot/locale/hu/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-04-21 19:19+0000\n"
-"Last-Translator: kelemeng python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Figyelem: ennek bekapcsolása után mentse az adatbázist, és futtassa a következő felügyeleti parancsot a címkék globális átnevezéséhez: python manage.py fix_question_tags
"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "A címkelista formátuma"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Válassza ki a címkék megjelenítési formátumát: egyszerű lista vagy címkefelhő"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Helyettesítő címkék használata"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "A helyettesítő címkék sok címke követésére vagy figyelmen kívül hagyására használhatók, az érvényes helyettesítő címke legvégén egy helyettesítő karakter áll"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "A bejegyzések alatt megjelenítendő hozzászólások alapértelmezett maximális száma"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Maximális hozzászóláshossz, < %(max_len)s kell legyen"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Hozzászólások szerkesztési idejének korlátozása"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Ha nincs bejelölve, akkor a hozzászólások szerkesztéséhez nem lesz időkorlát beállítva"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Hozzászólások szerkesztésére engedélyezett idő percben"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Az engedélyezéséhez engedélyezze az előző beállítást"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3454,11 +3437,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3481,86 +3464,86 @@ msgstr[1] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ">%(points)s points required to upvote "
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s points required to downvote "
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3571,57 +3554,57 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3631,103 +3614,103 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3735,221 +3718,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr ""
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr ""
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr ""
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr ""
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4219,49 +4202,57 @@ msgstr ""
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4283,17 +4274,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4493,19 +4484,14 @@ msgstr ""
msgid "back"
msgstr ""
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr ""
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr ""
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4513,21 +4499,21 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr ""
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr ""
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4540,11 +4526,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4637,7 +4622,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr ""
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5122,61 +5107,61 @@ msgstr ""
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr ""
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr ""
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr ""
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5185,87 +5170,87 @@ msgstr ""
msgid "delete this comment"
msgstr ""
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr ""
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr ""
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr ""
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr ""
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr ""
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5274,23 +5259,23 @@ msgstr ""
msgid "Questions"
msgstr ""
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr ""
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5298,7 +5283,15 @@ msgstr ""
msgid "Edit question"
msgstr ""
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5382,66 +5375,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "People"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr ""
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr ""
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr ""
@@ -5462,97 +5455,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr ""
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr ""
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5561,19 +5486,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5744,7 +5656,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr ""
@@ -5763,6 +5675,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr ""
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6068,7 +5986,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6091,22 +6009,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6135,10 +6061,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6153,10 +6075,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6245,7 +6163,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6333,7 +6309,7 @@ msgid "Did not find what you were looking for?"
msgstr ""
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
+msgid "Ask your question!"
msgstr ""
#: templates/main_page/tab_bar.html:11
@@ -6380,7 +6356,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6743,7 +6719,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6878,6 +6854,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6989,24 +6994,24 @@ msgstr ""
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr ""
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr ""
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr ""
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr ""
@@ -7104,20 +7109,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7217,7 +7222,7 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr ""
@@ -7233,7 +7238,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr ""
@@ -7242,11 +7247,11 @@ msgstr ""
msgid "votes"
msgstr ""
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr ""
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7267,7 +7272,15 @@ msgstr ""
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7275,23 +7288,23 @@ msgstr ""
msgid "Contributors"
msgstr ""
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr ""
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr ""
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7562,23 +7575,23 @@ msgstr ""
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7642,38 +7655,38 @@ msgstr ""
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr ""
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr ""
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr ""
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr ""
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr ""
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7732,46 +7745,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr ""
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7800,113 +7817,113 @@ msgstr ""
msgid "Privacy policy"
msgstr ""
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr ""
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr ""
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr ""
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr ""
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr ""
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr ""
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr ""
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr ""
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr ""
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr ""
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr ""
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7915,45 +7932,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/hu/LC_MESSAGES/djangojs.po b/askbot/locale/hu/LC_MESSAGES/djangojs.po
index 431cc815..c92dcfe7 100644
--- a/askbot/locale/hu/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/hu/LC_MESSAGES/djangojs.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-24 01:24+0000\n"
-"Last-Translator: kelemeng
"
-msgstr "Bármikor hozzászólhat saját bejegyzéseihez.
"
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr "jelentkezzen be vagy regisztráljon a hozzászóláshoz"
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Adja meg a kérdés címét (>10 karakter)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr "mentés"
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr "Adja meg a logó URL-t vagy töltsön fel egy képet"
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr "Valóban el kívánja távolítani a képet?"
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr "logó módosítása"
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr "logó hozzáadása"
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr "a címke („%s”) már létezik, nem kell megismételni (Esc a törléshez)"
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] "legfeljebb %s címke engedélyezett"
msgstr[1] "legfeljebb %s címke engedélyezett"
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr "Törli a kategóriát?"
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr "szerkesztés"
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr "a kategórianév nem lehet üres"
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr "már létezik ezen a szinten!"
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr "új kategória"
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr "címkék mentése"
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr "Felhasználónév:"
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr "Csoportnév:"
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr "Megosztva ezen felhasználókkal:"
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr "Megosztva ezen csoportokkal:"
@@ -496,202 +500,206 @@ msgstr "csoport hozzáadása"
msgid "add"
msgstr "hozzáadás"
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr "és"
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "kattintson a bezáráshoz"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr "kattintson a megjegyzés szerkesztéséhez"
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr "átalakítás válasszá"
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr "Ok"
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr "Mégse"
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr "Fájl feltöltve: %s"
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr "Válasszon másik képet"
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr "Válasszon másik fájlt"
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr "Hoppá, hiba történt. Elnézést."
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr "Válasszon egy beszúrandó képet"
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr "Válasszon egy beszúrandó fájlt"
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr "Az engedélyezett fájltípusok:"
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr "Vagy illessze be a fájl URL-címét:"
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr "Mentés"
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr "elmentve"
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr "engedélyezve"
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr "letiltva"
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr "A csoport (%(name)s) már létezik. A csoportnevek nem különböztetik meg a kis- és nagybetűket."
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr "lásd a(z) „%s” címkéjű kérdéseket "
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr "óta"
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr "mostantól"
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr "egy perc"
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr "%d perc"
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr "egy óra"
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr "%d óra"
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr "tegnap"
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr "%d nap"
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr "egy hónap"
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr "%d hónap"
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr "egy év"
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr "%d év"
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr "Jan"
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr "Feb"
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr "Már"
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr "Ápr"
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr "Máj"
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr "Jún"
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr "Júl"
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr "Aug"
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr "Szep"
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr "Okt"
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr "Nov"
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr "Dec"
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr "2 napja"
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] "%s órája"
msgstr[1] "%s órája"
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -754,7 +762,7 @@ msgstr "vízszintes vonal"
msgid "undo"
msgstr "visszavonás"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "mégis"
@@ -770,15 +778,15 @@ msgstr "adja meg az URL-címet"
msgid "upload file attachment"
msgstr "fájlmelléklet feltöltése"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr "kép leírása"
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr "fájlnév"
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr "hivatkozásszöveg"
diff --git a/askbot/locale/it/LC_MESSAGES/django.po b/askbot/locale/it/LC_MESSAGES/django.po
index 7068ad09..4b9aa322 100644
--- a/askbot/locale/it/LC_MESSAGES/django.po
+++ b/askbot/locale/it/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-04-30 16:58+0000\n"
-"Last-Translator: giohappy python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Attenzione: dopo aver selezionato questa impostazione fai un backup del database ed esegui il comando python manage.py fix_question_tags
per aggiornare i tag globalmente"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Formato della lista dei tag"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Seleziona il formato con cui mostrare i tag: lista semplice o come una nuvola di tag"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Usa tag multipli"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "I tag wildcards possono essere usati per selezionare o ignorare più tag insieme, un tag wildcard valido ha una wildcard singola alla fine"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Numero massimo di commenti da mostrare sotto il post"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "La lunghezza massima del commento deve essere < %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Limita il tempo per modificare i commenti"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Se non selezionato, non ci sarà un limite di tempo per modificare i commenti"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Minuti concessi per modificare un commento"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Per abilitare questa impostazione devi selezionare la precedente"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Spiacenti, non è stato possibile inviare la tua domanda per insufficienza di privilegi del tuo account
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Per favore accetta la migliore risposta per questa domanda:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Per favore accetta la migliore risposta per queste domande:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3454,11 +3437,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "nuova domanda" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3481,86 +3464,86 @@ msgstr[1] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Mi spiace, non puoi accettare risposte perché il tuo account è stato bloccato"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Mi spiace, non puoi accettare risposte perché il tuo account è sospeso"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr "Ti servono più di %(points)s punti per accettare o negare la risposta alla tua stessa domanda"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Mi spiace, solo il moderatore o l'autore della domanda, %(username)s, può accettare la risposta migliore"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Mi spiace, il tuo account è stato bloccato"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Mi spiace, il tuo account è stato sospeso"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "Serve avere più di %(points)s punti reputazione per poter votare a favore"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "Serve avere più di %(points)s punti reputazione per poter votare contro"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Mi spiace, gli utenti bloccati non possono caricare files"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Mi spiace, gli utenti sospesi non possono caricare files"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3571,57 +3554,57 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Mi spiace, solo gli autori, i moderatori e gli amministratori possono modificare i commenti"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Mi spiace, visto che il tuo account è sospeso puoi commentare solo i tuoi post"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Mi spiace, puoi commentare solo i tuoi post e le risposte alle tue domande. Per commentare gli altri post serve avere almeno %(min_rep)s punti reputazione. "
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Questo post è stato cancellato e può essere consultato solo dall'autore, dai moderatori e dagli amministratori"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Mi spiace, solo l'autore, i moderatori e gli amministratori possono modificare un post cancellato."
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Mi spiace, non puoi modificare alcun post perché il tuo account è stato bloccato"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Mi spiace, puoi modificare solo i tuoi post perché il tuo account è sospeso"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Mi spiace, per modificare i post appartenenti allo wiki servono almeno %(min_rep)s punti reputazione"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Mi spiace, per modificare i post altrui servono almeno %(min_rep)s punti reputazione"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3631,103 +3614,103 @@ msgid_plural ""
msgstr[0] "Mi spiace, non puoi cancellare la tua domanda perché qualcun altro ha fornito una risposta con voti a favore"
msgstr[1] "Mi spiace, non puoi cancellare la tua domanda perché qualcun altro ha fornito delle risposte con voti a favore"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Mi spiace, non puoi cancellare post perché il tuo account è blocato"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Mi spiace, puoi cancellare solo i tuoi post perché il tuo account è sospeso"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Mi spiace, non puoi chiudere domande perché il tuo account è stato bloccato"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Mi spiace, non puoi chiudere domande perché il tuo account è sospeso"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Mi spiace, per chiudere post altrui servono almeno %(min_rep)s punti reputazione."
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Mi spiace, per chiudere una tua domanda servono almeno %(min_rep)s punti reputazione."
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Mi spiace, solo amministratori, moderatori e autori con più di %(min_rep)s punti reputazione possono riaprire domande."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Mi spiace, per riaprire una tua domanda devi avere almeno %(min_rep)s punti reputazione."
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3735,221 +3718,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Mi spiace, solo gli autori, i moderatori e gli amministratori possono cambiare i tag di una domanda cancellata"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Mi spiace, non puoi cambiare i tag perché il tuo account è stato bloccato."
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Mi spiace, puoi cambiare i tag solo alle tue domande perché il tuo account è sospeso."
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Mi spiace, servono almeno %(min_rep)s punti reputazione per cambiare i tag di una domanda"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Mi spiace, non puoi cancellare commenti perché il tuo account è stato bloccato."
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Mi spiace, puoi cancellare solo i tuoi commenti perché il tuo account è sospeso."
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Mi spiace, servono almeno %(min_rep)s punti reputazione per cancellare commenti."
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "il %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "tra due giorni"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "domani"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "%(hr)d ora fa"
msgstr[1] "%(hr)d ore fa"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "%(min)d minuto fa"
msgstr[1] "%(min)d minuti fa"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "utente non registrato"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Amministratore del sito"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderatore del forum"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Utente sospeso"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Utente bloccato"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Utente registrato"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Utente in prova"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Utente approvato"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s ha %(reputation)s punti reputazione"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "una medaglia d'argento"
msgstr[1] "%(count)d medaglie d'argento"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "una medaglia di bronzo"
msgstr[1] "%(count)d medaglie di bronzo"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Congratulazioni, hai ricevuto la medaglia %(badge_name)s. Controlla il tuo profilo."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "La tua registrazione al tag è stata salvata. grazie!"
@@ -4219,49 +4202,57 @@ msgstr "Molto attivo in domande con lo stesso tag"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Mi spiace, questa domanda è stata cancellata e non è più accessibile"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Spiacenti, la risposta che stai cercando non è più disponibile, perché la domanda è stata rimossa"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Mi spiace, questa domanda è stata cancellata e non è più accessibile"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4283,17 +4274,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4493,19 +4484,14 @@ msgstr "Modifica risposta"
msgid "back"
msgstr "indietro"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revisione"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Salva modifica"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4513,21 +4499,21 @@ msgstr "Salva modifica"
msgid "Cancel"
msgstr "Annulla"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "nascondi anteprima"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "mostra anteprima"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4540,11 +4526,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4637,7 +4622,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr "Medaglie di bronzo: date anche come riconoscimento speciale"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5122,61 +5107,61 @@ msgstr "numero attuale di voti"
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "chiesto il"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "risposto il"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "scritto il"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "modificato"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "vedi domande con i tag '%(tag)s'"
@@ -5185,87 +5170,87 @@ msgstr "vedi domande con i tag '%(tag)s'"
msgid "delete this comment"
msgstr "cancella questo commento"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "modifica"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "Immagine gravatar per %(username)s "
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "precedente"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "pagina corrente"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "pagina successiva"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "risposte per %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "nessuna nuova risposta"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5274,23 +5259,23 @@ msgstr ""
msgid "Questions"
msgstr "Domande"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Rispondi alla tua domanda"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5298,7 +5283,15 @@ msgstr ""
msgid "Edit question"
msgstr "Modifica domanda"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5382,66 +5375,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Utenti"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "più recenti"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "per nome"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Nessun utente trovato"
@@ -5462,97 +5455,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Salva il tuo indirizzo e-mail"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Salva e-mail"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Verifica e-mail"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "E-mail non modificata"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "E-mail modificata"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "E-mail verificata"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5561,19 +5486,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5744,7 +5656,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Password"
@@ -5763,6 +5675,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Cambia password"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6068,7 +5986,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6091,22 +6009,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6135,10 +6061,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6153,10 +6075,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6245,7 +6163,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Siti"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Per favore correggi l'errore sottostante"
+msgstr[1] "Per favore correggi gli errori sottostanti"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Impostazioni incluse in %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Non hai i permessi per modificare i valori."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentazione"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Log out"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Home"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Modifica impostazioni del sito"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "I Livesettings sono disabilitati per questo sito."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Tutte le opzioni di configurazione devono essere modificate nel file settings.py"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Impostazioni per i gruppi: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Espandi tutti"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6333,8 +6309,8 @@ msgid "Did not find what you were looking for?"
msgstr "Non hai trovato quello che cercavi?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Poni tu stesso la domanda!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6380,7 +6356,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6743,7 +6719,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6878,6 +6854,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6989,24 +6994,24 @@ msgstr "ultimo accesso"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "residenza"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "età"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "voti rimanenti per oggi"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "voti rimanenti"
@@ -7104,20 +7109,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7217,7 +7222,7 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "commenti e risposte a domande"
@@ -7233,7 +7238,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "elenco dei voti dati"
@@ -7242,11 +7247,11 @@ msgstr "elenco dei voti dati"
msgid "votes"
msgstr "voti"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "impostazioni notifiche via e-mail"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "modera questo utente"
@@ -7267,7 +7272,15 @@ msgstr "cerca di dare una risposta, non di iniziare una discussione"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7275,23 +7288,23 @@ msgstr ""
msgid "Contributors"
msgstr "Utenti attivi"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(campo obbligatorio)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "attiva/disattiva l'anteprima del codice Markdown"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7562,23 +7575,23 @@ msgstr "impostazioni"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Accedi o registrati per inserire domande"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7642,38 +7655,38 @@ msgstr "questa e-mail è già in uso, scegline un'altra"
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "la password è obbligatoria"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "per favore, digita di nuovo la password"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "le due password non coincidono, riprova"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2 giorni fa"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "ieri"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "%(hr)d ora fa"
msgstr[1] "%(hr)d ore fa"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7732,46 +7745,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "la frequenza delle notifiche via e-mail è stata impostata a 'ogni giorno'"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Accedi per sottoscrivere i tag: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Accedi per votare"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7800,113 +7817,113 @@ msgstr "Siamo curiosi di sentire la tua opinione! Sarà per la prossima volta :)
msgid "Privacy policy"
msgstr "Regole per la privacy"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Mi spiace, questo commento è stata cancellato e non è più accessibile"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "modera utente"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "profilo utente"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "profilo"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "attività recente"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profilo utente — attività recente"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profilo utente — risposte"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profilo utente — voti"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "domande preferite"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profilo utente — domande preferite"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "i cambiamenti sono stati salvati"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "notifiche via e-mail cancellate"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profilo utente — notifiche via e-mail"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Mi spiace, gli utenti non registrati non possono caricare file."
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "i tipi di file consentiti sono: '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "la dimensione massima di file caricabile è %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Errore nel caricamento del file. Contatta un amministratore."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7915,45 +7932,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Accedi per rispondere alle domande"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Gli utenti non registrati non possono lasciare commenti. Accedi o registrati."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Mi spiace, gli utenti non registrati non possono modificare i commenti."
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Gli utenti non registrati non possono cancellare commenti. Accedi o registrati."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Mi spiace, ci sono dei problemi tecnici"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/it/LC_MESSAGES/djangojs.po b/askbot/locale/it/LC_MESSAGES/djangojs.po
index 968e16b3..f2096fbc 100644
--- a/askbot/locale/it/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/it/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Per piacere inserisce un titolo per la tua domanda (>10 caratteri)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -495,202 +499,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr ""
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -753,7 +761,7 @@ msgstr "barra orizzontale"
msgid "undo"
msgstr "annulla"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "Esegui nuovamente"
@@ -769,15 +777,15 @@ msgstr "inserisci l'indirizzo web, e.g.
http://www.askbot.org/
python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "タグ"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing Dear %(name)s,
The following question has been updated " @@ -3446,11 +3430,11 @@ msgid_plural "" " %(sitename)s:
" msgstr[0] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "あたらしい質問" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3472,86 +3456,86 @@ msgstr[0] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ""
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ""
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3561,57 +3545,57 @@ msgid_plural ""
"minutes from posting"
msgstr[0] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3620,317 +3604,317 @@ msgid_plural ""
"by other users"
msgstr[0] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
"Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgstr[0] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr ""
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "登録ユーザー"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr ""
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr ""
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4200,49 +4184,57 @@ msgstr ""
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4263,17 +4255,17 @@ msgid "%(count)d answer:"
msgid_plural "%(count)d answers:"
msgstr[0] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4473,19 +4465,14 @@ msgstr "回答を編集する"
msgid "back"
msgstr "もどる"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "改訂"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "編集を保存する"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4493,21 +4480,21 @@ msgstr "編集を保存する"
msgid "Cancel"
msgstr "キャンセル"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "プレビューを隠す"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "プレビューを表示する"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4520,11 +4507,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4616,7 +4602,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr ""
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5101,61 +5087,61 @@ msgstr "現在の投票数"
msgid "anonymous user"
msgstr "匿名ユーザー"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "質問日"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "回答日"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "投稿日"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "更新日"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5164,86 +5150,86 @@ msgstr ""
msgid "delete this comment"
msgstr "このコメントを削除する"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "編集する"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr ""
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "%(username)s のウェブサイトは %(url)s です"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "以前の"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "現在のページ"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "%(num)s ページ"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "次のページ"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5252,23 +5238,23 @@ msgstr ""
msgid "Questions"
msgstr "質問"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "あなた自身の質問に回答する"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5276,7 +5262,15 @@ msgstr ""
msgid "Edit question"
msgstr "質問を編集する"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5360,66 +5354,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "ユーザー"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "» により並び替える"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "カルマ"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "新規登録順"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "ユーザー名順"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "何も見付かりませんでした"
@@ -5440,97 +5434,29 @@ msgid "Sign in"
msgstr "サインイン"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "電子メールの変更"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "電子メールアドレスを保存する"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "電子メールを保存する"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "電子メールを有効にする"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "電子メールは変更されませんでした"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "電子メールは変更されました"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "電子メールは確証されました"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5539,19 +5465,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "登録"
@@ -5722,7 +5635,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "パスワード"
@@ -5741,6 +5654,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "パスワードを変更する"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6046,7 +5965,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6068,22 +5987,30 @@ msgstr[0] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6112,10 +6039,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6130,10 +6053,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6222,7 +6141,64 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "サイト"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "ドキュメント"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "ログアウト"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "ホーム"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "サイト設定を編集する"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "グループ設定: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6309,8 +6285,8 @@ msgid "Did not find what you were looking for?"
msgstr "探していた物は見付かりませんか?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "ぜひ、質問を投稿しましょう!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6354,7 +6330,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6715,7 +6691,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6850,6 +6826,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6961,24 +6966,24 @@ msgstr "最終活動"
msgid "website"
msgstr "ウェブサイト"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "場所"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "年齢"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "今日の使われてない投票"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "消え去った投票"
@@ -7075,19 +7080,19 @@ msgid "Followed by %(count)s person"
msgid_plural "Followed by %(count)s people"
msgstr[0] "%(count)s 人にフォローされています"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "%(count)s 人をフォローしています"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7181,7 +7186,7 @@ msgstr ""
msgid "User profile"
msgstr "ユーザープロファイル"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr ""
@@ -7197,7 +7202,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr ""
@@ -7206,11 +7211,11 @@ msgstr ""
msgid "votes"
msgstr "投票"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr ""
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7231,7 +7236,15 @@ msgstr "議論にかみ合うよりむしろ、回答をあたえるようにし
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7239,23 +7252,23 @@ msgstr ""
msgid "Contributors"
msgstr "貢献者"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "タグ:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(必須)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "リアルタイムMarkdown編集プレビューをトグルする"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7523,23 +7536,23 @@ msgstr "設定"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "投稿するにはログインしてください"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7603,37 +7616,37 @@ msgstr "電子メールはすでに誰か別人につかわれています。他
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "パスワードは必須です"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "確認用パスワードを入力してください"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "申し訳ありませんが、入力したパスワードは一致しませんでした。再度入力してください。"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "二日前"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "昨日"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "%(hr)d 時間前"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7691,46 +7704,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "メール更新頻度が日刊に設定されました。"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "投稿を削除/復元するにはサインインしてください"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7759,113 +7776,113 @@ msgstr ""
msgid "Privacy policy"
msgstr "プライバシーポリシー"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "ユーザプロファイル"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "ユーザプロファイル概略"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "最近のユーザの活動"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "プロファイル:最近の活動"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "プロファイル:応答"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "プロファイル:投票"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "ユーザーのカルマ"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "プロフィール - ユーザーのカルマ"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "ユーザのお気に入りの質問"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "プロファイル:お気に入りの質問"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "変更が保存されました"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "メール更新がキャンセルされました"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "プロファイル:メール登録など"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7874,45 +7891,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/ja/LC_MESSAGES/djangojs.po b/askbot/locale/ja/LC_MESSAGES/djangojs.po
index 32419735..179ae9f3 100644
--- a/askbot/locale/ja/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/ja/LC_MESSAGES/djangojs.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Tomoyuki KATO
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "質問の見出しを入力してください ( >10 文字)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -485,201 +489,205 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "閉じるにはクリックしてください"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -741,7 +749,7 @@ msgstr "水平線"
msgid "undo"
msgstr "やり直し"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "再実行"
@@ -757,15 +765,15 @@ msgstr "ウェブアドレス(例、http://www.example.com \"page title\")
msgid "upload file attachment"
msgstr "ファイルを選択してアップロードしてください:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/ko/LC_MESSAGES/django.po b/askbot/locale/ko/LC_MESSAGES/django.po
index a425655e..a2a85bc7 100644
--- a/askbot/locale/ko/LC_MESSAGES/django.po
+++ b/askbot/locale/ko/LC_MESSAGES/django.po
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# <16thetower@gmail.com>, 2012.
-# python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "주의: 체크한 후에는, 데이터베이스를 백업하고, 전체 태그들의 이름을 바꿔주는 다음 명령을 수행하세요: python manage.py fix_question_tags
"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "태크 목록의 형식"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "간단한 목록나 태그 클라우드 중 선택"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "와일드카드 태그 사용하기"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "와일드카드 태그는 한번에 많은 태그들을 팔로우하거나 무시할 수 있습니다. 마지막에 한 개의 와일드카드를 갖는 와일드카드 태그가 유효합니다"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "게시물 아래에 표시되는 댓글의 최대 개수의 기본값"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "최대 댓글 개수는 %(max_len)s 보다 작아야합니다"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "댓글 수정 제한 시간"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "체크하지 않으면, 댓글 수정에 시간 제한을 두지 않습니다"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "댓글 수정 허용 시간"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "이 설정을 활성화 하려면 이전 항목을 체크하세요"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
죄송합니다. 귀하의 계정으로는 질문을 등록하실 수 없습니다
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "귀하의 질문의 %(question_count)d에 대한 으뜸 답변을 선택하세요" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "이 질문에 대한 으뜸 답변을 선택하세요:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "이 질문들에 대한 으뜸 답변을 선택하세요:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "%(topics)s에 관한 질문 %(question_count)d개가 업데이트됨" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3450,11 +3434,11 @@ msgid_plural "" " %(sitename)s:
" msgstr[0] "%(name)s 님,
The following %(num)d questions have been updated on %(sitename)s:
" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "새로운 질문" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3476,86 +3460,86 @@ msgstr[0] "%(topics)s에 관한 질문 중 %(question_count)d개가 답변되지
msgid "Please log in to use %s"
msgstr "%s를 사용하기 위해 로그인해주세요"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "죄송합니다. 계정이 차단되어 으뜸 답변을 선택 또는 거부할 수 없습니다"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "죄송합니다. 계정이 정지되어 으뜸 답변을 선택 또는 거부할 수 없습니다"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr "자신의 질문에 대하여 스스로 작성한 답변을 선택하려면 %(points)s 포인트가 필요합니다"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "미안합니다. 이 답변은 %(will_be_able_at)s 이후에 채택할 수 있습니다"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "미안합니다. 조정나 또는 질문의 원저자인 %(username)s만이 으뜸 답변을 채택하거나 거부할 수 있습니다"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr "미안합니다. 자신의 포스트에 투표하실 수 없습니다"
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "미안합니다. 계정이 차단된 것 같습니다"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "미안합다. 계정이 정지된 것 같습니다"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "찬성하기 위해 >%(points)s 점 필요"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "반대표에 >%(points)s 점 필요"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "죄송합니다. 차단된 사용자는 파일을 업로드할 수 없습니다"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "미안합니다. 정지된 사용자는 파일을 업로드할 수 없습니다"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr "미안합니다. 파일 업로드에는 karma >%(min_rep)s가 필요합니다"
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3565,57 +3549,57 @@ msgid_plural ""
"minutes from posting"
msgstr[0] "미안합니다. 댓글은 게시한지 %(minutes)s 분 이내에만 수정할 수 있습니다(마지막 것은 제외) ."
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "미안합니다. 게시물의 소유자 또는 조정자만이 댓글을 수정할 수 있습니다"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "미안합니다. 계정이 정지되었기 때문에 자신의 게시물에 대해서만 댓글을 달 수 있습니다"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "미안합니다. 게시물에 댓글을 달기 위해서는 %(min_rep)s 점의 평판이 필요합니다. 그렇더라도 자신의 게시물에는 댓글을 달 수 있으며 자신의 질문에도 답변할 수 있습니다"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "이 게시물은 삭제되었으며 게시물의 소유자, 사이트 관리자 및 조정자만 볼 수 있습니다"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "미안합니다. 조정자, 사이트 관리자 및 게시물의 소유자만이 삭제된 게시물을 편집할 수 있습니다"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "미안합니다. 계정이 차단되어 게시물을 편집하실 수 없습니다"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "미안합니다. 계정이 정지되었으므로 자신의 게시물만 편집할 수 있습니다"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "미안합니다. 위키 게시물을 편집하려면, 최소 %(min_rep)s 점의 평판이 필요합니다"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "미안합니다. 다른 사람들의 게시물을 편집하려면, 최소 %(min_rep)s 점의 평판이 필요합니다"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3624,317 +3608,317 @@ msgid_plural ""
"by other users"
msgstr[0] "미안합니다. 다른 사용자가 게시한 답변에 추천이 있으므로 질문을 삭제할 수 없습니다."
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "미안합니다. 계정이 차단되었으므로 게시물을 삭제할 수 없습니다"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "미안합니다. 계정이 정지되었으므로 자신의 게시물만 삭제할 수 있습니다"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "미안합니다. 계정이 차단되었으므로 질문을 종료할 수 없습니다"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "미안합니다. 계정이 정지되었으므로 질문을 종료할 수 없습니다"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "미안합니다. 다른 사람의 게시물을 종료하려면 최소 %(min_rep)s의 평판이 필요합니다"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "미안합니다. 자신의 질문을 종료하려면 최소 %(min_rep)s 점의 평판이 필요합니다"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "미안합니다. 관리자, 조정자 또는 %(min_rep)s보다 높은 평판을 얻은 게시물의 소유자만이 질문을 재개할 수 있습니다."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "미안합니다. 자신의 질문을 재개하려면 최소 %(min_rep)s 평판이 필요합니다"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr "전에 이 질문을 신고하였으므로 다시 신고하실 수 없습니다"
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr "미안합니다. 계정이 차단되어 포스트에 대해 공격적이라고 신고하실 수 없습니다"
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr "미안합니다. 포스트가 공격적이라고 신고하시기 위해서는 최소 평판 %(min_rep)s 점이 필요합니다"
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr "미안합니다. 공격적인 게시물에 대한 신고는 하루에 %(max_flags_per_day)s 회까지 하실 수 있습니다."
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "존재하지 않는 표시는 제거할수 없습니다"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr "미안합니다. 계정이 차단되었으므로 신고를 취소하실 수 없습니다"
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr "미안합니다. 계정이 정지되어 신고를 취소하실 수 없습니다. 포럼 관리자에게 문의하세요."
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
"Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgstr[0] "미안합니다. 게시물을 신고하려면 최소 평판 %(min_rep)d 점이 필요합니다"
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "모든 표시를 제거할수 있는 권한이 없습니다"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "이 항목에 대한 표시가 없습니다"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "미안합니다. 질문의 소유자, 사이트 관리자 및 조정자만이 삭제된 질문에 대하여 태그를 수정할 수 있습니다"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "미안합니다. 계정이 차단되었으므로 질문의 태그를 수정할 수 없습니다"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "미안합니다. 계정이 정지되었으므로 자신의 질문에 대한 태그만 수정하실 수 있습니다"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "미안합니다. 질문에 대한 태그를 수정하려면 최소 %(min_rep)s 평판이 필요합니다"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "미안합니다. 계정이 차단되었으므로 댓글을 삭제할 수 없습니다"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "미안합니다. 계정이 정지되었으므로 자신의 댓글만 삭제할 수 있습니다"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "미안합니다. 댓글을 삭제하려면 %(min_rep)s 평판이 필요합니다"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr "미안합니다. 오래된 투표는 취소하실 수 없습니다"
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "on %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "이틀 내로"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "내일"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "%(hr)d 시간 내"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "%(min)d 분 내"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d 일"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "자신의 질문에 답변하기 위해서는 %(days)s 동안 기다려야 합니다. %(left)s 답변을 게시할 수 있습니다"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "익명"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "사이트 관리자"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "포럼 조정자"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "정지된 사용자"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "차단된 사용자"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "등록된 사용자"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Watched 사용자"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "승인된 사용자"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s 카르마는 %(reputation)s입니다"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "%(count)d 금 배지"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "%(count)d 은 배지"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "%(count)d 동 배지"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s과 %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s는 %(badges)s를 갖고 있습니다"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "축하합니다. '%(badge_name)s' 배지를 받으셨습니다. 사용자 프로필을 확인해보세요."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "태그 구독이 저장되었습니다. 고맙습니다!"
@@ -4204,49 +4188,57 @@ msgstr "한 개의 태그에 매우 활동적임"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "미안합니다. 이 질문은 삭제되었으므로 더 이상 접근할 수 없습니다"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "미안합니다. 부모 질문이 삭제되었으므로, 찾으시는 답변이 더 이상 유효하지 않습니다"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "미안합니다. 이 질문은 삭제되었으므로 더 이상 접근할 수 없습니다"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "미안합니다. 찾으시는 댓글의 부모 질문이 삭제되었으므로 더 이상 접근할 수 없습니다."
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "미안합니다. 찾으시는 댓글의 부모 답변이 삭제되었으므로 더 이상 접근할 수 없습니다."
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4267,17 +4259,17 @@ msgid "%(count)d answer:"
msgid_plural "%(count)d answers:"
msgstr[0] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4477,19 +4469,14 @@ msgstr "답변을 편집"
msgid "back"
msgstr "뒤로"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "리비전"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "수정내용 저장하기"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4497,21 +4484,21 @@ msgstr "수정내용 저장하기"
msgid "Cancel"
msgstr "취소"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "미리보기 숨김"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "미리보기"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr "질문하기"
@@ -4524,11 +4511,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4620,7 +4606,7 @@ msgstr "은 배지: 높은 수준의 공헌에 대하여 가끔 포상"
msgid "bronze badge: often given as a special honor"
msgstr "동 배지: 특별한 영예로서 종종 주어짐"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5105,61 +5091,61 @@ msgstr "현재 총 투표수"
msgid "anonymous user"
msgstr "익명의 사용자"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "질문"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "답변"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "게시"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "이 게시물은 커뮤니티 위키로 표시되었습니다"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "이 게시물은 위키입니다.\n 개선시켜주세요. (카르마 %(wiki_min_rep)s 이상이면 가능)"
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "수정"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "'%(tag)s 로 태그된 질문들 보기"
@@ -5168,86 +5154,86 @@ msgstr "'%(tag)s 로 태그된 질문들 보기"
msgid "delete this comment"
msgstr "이 댓글을 삭제"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "편집"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "%(alias)s 를 팔로우"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "%(alias)s 를 언팔로우"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "%(alias)s 를 팔로우중"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s의 그라바타 이미지"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "%(username)s의 웹사이트는 %(url)s입니다"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "이전"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "현재 페이지"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "%(num)s 페이지"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "다음 페이지"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "%(username)s의 응답"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] "%(response_count)s 개의 새로운 응답이 있습니다"
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "아직 새로운 반응들이 없습니다"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s 새로 신고된 게시물 및 %(seen)s 이전"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s 새로 신고된 게시물"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s 신고된 게시물"
@@ -5256,23 +5242,23 @@ msgstr "%(seen)s 신고된 게시물"
msgid "Questions"
msgstr "질문들"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr "댓글 달기"
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "자신의 질문에 답변"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr "답변하기"
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr "글 작성을 위해 로그인/가입"
@@ -5280,7 +5266,15 @@ msgstr "글 작성을 위해 로그인/가입"
msgid "Edit question"
msgstr "질문을 편집"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5364,66 +5358,66 @@ msgstr "구독"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "사람들"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "정렬 기준 »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "가장 높은 평판을 얻은 사람들"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "카르마"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "최근에 가입한 사람들 보기"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "최근"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "사이트에 처음 가입한 사람들 보기"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "사람들을 이름 순으로 보기"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "사용자명"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "아무 것도 찾지 못함."
@@ -5444,97 +5438,29 @@ msgid "Sign in"
msgstr "로그인"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "이메일 변경"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "이메일 주소를 저장해 주십시오"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr "새 소식 받아보기에 다른 이메일을 사용하고 싶으시다면 새로운 이메일을 아래의 박스에 입력하세요.\n
현재 사용하시는 이메일은 %%(email)s입니다"
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr "아래의 박스에 이메일 주소를 입력하세요.\n이 Q&A 포럼에서는 유효한 이메일 주소를 필요로 합니다. 원하신다면, \n관심 있는 질문 또는 전체 포럼에 대하여 이메일을 통하여 업데이트를 받아보기 하실 수 있습니다. 또한, 이메일은 유일한 \n그라바타 이미지을 생성하는 데에 사용됩니다. 이메일 주소는 노출되지 않으며 다른 사람에게 공유되지 않습니다."
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr "새로운 이메일: \n(다른 사람에게 보이지 않으니, 유효한 주소를 입력해주세요)"
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "이메일 저장"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "이메일 유효성 검사"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr "검증 링크가 있는 이메일이 \n%%(email)s으로 발송되었습니다. 웹 브라우저에서 이메일 링크를 따라가세요.\nQ&A에 대한 이메일을 적합하게 사용함을 확인하기 위하여 이메일 검증이 필요합니다.\n다른 이메일을 사용하고 싶으시면, 다시 변경해주세요."
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "이메일 변경 안됨"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr "이메일 주소 %%(email)s가 변경되지 않았습니다.\n이전 양식으로 돌아가거나,\n나중에 사용자 프로필에서 변경하실 수 있습니다."
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "이메일 변경됨"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr "\n귀하의 이메일 주소는 %%(email)s로 설정되었습니다. \n좋아하시는 질문에 대한 업데이트가 이 주소로 발송될 것입니다. \n이메일 알림은 새로운 소식일 있을 경우에만 하루에 한 번 이내로 발송됩니다."
+"href='%(change_email_url)s'>change it again."
+msgstr ""
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "이메일 인증됨"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5543,19 +5469,6 @@ msgid ""
"or less frequently."
msgstr "이메일을 확인해주셔서 고맙습니다! 이제 질문과 답변을 하실 수 있습니다. 또한 흥미로운 질문을 발견하시면 업데이트를 구독하심으로써 변경된 사항을 하루에 한 번 이내로 받아보실 수 있습니다."
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr "확인 이메일이 발송되지 않음"
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr "귀하의 현재 이메일 주소 %%(email)은 이미 확인되었으므로 새로운 키가 발송되지 않았습니다. 필요하다면 구독 갱신을 위하여 사용되는 이메일을 변경하실 수 있습니다"
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "등록"
@@ -5726,7 +5639,7 @@ msgid "Login or email"
msgstr "아이디 또는 이메일"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "비밀번호"
@@ -5745,6 +5658,12 @@ msgstr "새로운 비밀번호"
msgid "Please, retype"
msgstr "다시 입력해 주십시오"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "비밀번호 변경"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6050,7 +5969,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6072,22 +5991,30 @@ msgstr[0] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6116,10 +6043,6 @@ msgstr "\n
이 시스템은 당신의 메시지를 올바로 처리할 수 없
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6134,10 +6057,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6226,7 +6145,64 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "사이트"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "다음의 오류를 수정해주세요."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "%(name)s에 설정이 포함됨."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "값을 편집할 권한이 없습니다."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "첨부 문서"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "로그 아웃"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "홈"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "사이트 설정 수정"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "이 사이트에서는 Livesettings가 비활성화되었습니다."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "모든 구성 옵션은 사이트의 settings.py 파일에서 편집하여야 합니다"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "그룹 설정: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "전체 확대"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6313,8 +6289,8 @@ msgid "Did not find what you were looking for?"
msgstr "원하는 것을 찾지 못하셨나요?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "질문을 올려주세요!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6358,7 +6334,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "태그는 %(tag_count)s 개까지, 각각 %(max_chars)s 자 미만으로 사용해주세요"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6719,7 +6695,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6854,6 +6830,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6965,24 +6970,24 @@ msgstr "최종 방문일"
msgid "website"
msgstr "웹사이트"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "위치"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "나이"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "사용하지 않은 일일 투표"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "표 남음"
@@ -7079,19 +7084,19 @@ msgid "Followed by %(count)s person"
msgid_plural "Followed by %(count)s people"
msgstr[0] "%(count)s 명에게 팔로우됨"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "%(count)s 명을 팔로잉"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "인맥이 형성되지 않았습니다. 누군가를 팔로우하시겠습니까? - 프로필을 방문하고 \"팔로우\"를 클릭하시면 됩니다."
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "%(username)s 님의 인맥이 형성되지 않았습니다"
@@ -7185,7 +7190,7 @@ msgstr "답변 대상:"
msgid "User profile"
msgstr "사용자 프로필"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "다른 사람들의 질문에 대한 댓글과 답변"
@@ -7201,7 +7206,7 @@ msgstr "사용자 카르마 그래프"
msgid "questions that user is following"
msgstr "사용자가 팔로잉한 질문들"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "사용자 투표 기록"
@@ -7210,11 +7215,11 @@ msgstr "사용자 투표 기록"
msgid "votes"
msgstr "투표"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "이메일 구독 설정"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "이 사용자에 대한 조정"
@@ -7235,7 +7240,15 @@ msgstr "논의에 참여하기 보다는 답변을 하기 위해 노력하라."
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7243,23 +7256,23 @@ msgstr ""
msgid "Contributors"
msgstr "공헌자"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ", 이들 중 하나가 요구됩니다"
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "태그들:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(필수)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "실시간 마크다운 편집기 미리보기 토글"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7527,23 +7540,23 @@ msgstr "설정"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "0"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "앗, 죄송합니다. 오류가 있네요"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "게시하려면 로그인해주세요"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "게시물에서 스팸이 탐지되었습니다. 잘못 탐지되었다면 죄송합니다"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7607,37 +7620,37 @@ msgstr "이 이메일은 이미 다른 사람이 사용하고 있습니다. 다
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "비밀번호가 필요합니다"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "비밀번호 (한 번 더 입력해주세요)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "비밀번호를 한 번 더 입력해주세요"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "미안합니다. 입력하신 비밀번호가 일치하지 않습니다. 다시 입력해주세요"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "이틀 전"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "어제"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "%(hr)d 시간 전"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7695,46 +7708,50 @@ msgstr "구독이 저장되었지만, 이메일 주소 %(email)s에 대한 확
msgid "email update frequency has been set to daily"
msgstr "이메일 업데이트 주기가 매일로 설정되었습니다"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "태그 구독이 취소되었습니다(되돌리기)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "%(tags)s를 구독하려면 로그인해주세요"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "투표하려면 로그인해주세요"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "게시물을 삭제/복구하려면 로그인해주세요"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7763,113 +7780,113 @@ msgstr "피드백을 들려주세요! 다음 번에는요 :)"
msgid "Privacy policy"
msgstr "개인정보 정책"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "미안합니다. 찾으시는 댓글은 삭제되었거나 더 이상 접근할 수 없습니다"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "사용자 조정"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "사용자 프로필"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "사용자 프로필 둘러보기"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "사용자의 최근 활동"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "프로필 - 최근 활동"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "프로필 - 응답"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "프로필 - 투표"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "사용자 카르마"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "프로필 - 사용자의 카르마"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "사용자가 좋아하는 질문"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "프로필 - 좋아하는 질문"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "변경사항이 저장됨"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "이메일 변경이 취소됨"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "프로필 - 이메일 구독"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "미안합니다. 익명으로 파일을 업로드할 수 없습니다"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "허용되는 파일 형식은 '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "최대 업로드 파일 크기는 %(file_size)sK입니다"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "파일 업로드 오류. 사이트 관리자에게 문의해주세요. 고맙습니다."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7878,45 +7895,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr "익명으로 질문을 올리시는 것을 환영합니다. 게시물을 제출하면, 로그인/가입 페이지로 이동합니다. 귀하의 질문은 현재 세션 내에 저장되며 로그인 후에 발행됩니다. 로그인/가입 절차는 매우 간단합니다. 로그인에는 30 초, 처음 가입에는 몇 분 밖에 걸리지 않습니다."
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "질문에 답하려면 로그인해주세요"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "미안합니다. 로그아웃하신 것으로 보여서 댓글을 달 수 없습니다. 로그인해주세요."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "미안합니다. 익명의 사용자는 댓글을 편집할 수 없습니다"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "미안합니다. 로그아웃하신 것으로 보여서 댓글을 삭제할 수 없습니다. 로그인해주세요."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "미안합니다. 기술적인 어려움이 있는 것 같습니다."
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/ko/LC_MESSAGES/djangojs.po b/askbot/locale/ko/LC_MESSAGES/djangojs.po
index 25a4fc23..f3dc64db 100644
--- a/askbot/locale/ko/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/ko/LC_MESSAGES/djangojs.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# <16thetower@gmail.com>, 2012.
-# Yong Choi
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "질문을 입력해 주세요 (10자 이상)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -486,201 +490,205 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "close를 선택"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -742,7 +750,7 @@ msgstr "수평 막대"
msgid "undo"
msgstr "실행 취소"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "다시 실행"
@@ -758,15 +766,15 @@ msgstr "웹사이트 주소를 입력해주세요.\n예: http://www.example.com
msgid "upload file attachment"
msgstr "업로드할 파일을 선택해주세요"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/pt/LC_MESSAGES/django.po b/askbot/locale/pt/LC_MESSAGES/django.po
index 79d4e84d..7a798e0f 100644
--- a/askbot/locale/pt/LC_MESSAGES/django.po
+++ b/askbot/locale/pt/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-05-10 13:51+0000\n"
-"Last-Translator: littlepig python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr ""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3454,11 +3437,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "nova questão" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3481,86 +3464,86 @@ msgstr[1] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ""
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ""
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3571,57 +3554,57 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3631,103 +3614,103 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3735,221 +3718,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "em %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "amanhã"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "em %(hr)d hora"
msgstr[1] "em %(hr)d horas"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "em %(min)d minuto"
msgstr[1] "em %(min)d minutos"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d dia"
msgstr[1] "%(days)d dias"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anónimo"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Adminictrador do sítio"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderador do fórum"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Utilizador suspenso"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Utilizador bloqueado"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Utilizador registado"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Utilizador monitorizado"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Utilizador aprovado"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4219,49 +4202,57 @@ msgstr ""
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4283,17 +4274,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4493,19 +4484,14 @@ msgstr "Editar resposta"
msgid "back"
msgstr "recuar"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revisão"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Gravar edição"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4513,21 +4499,21 @@ msgstr "Gravar edição"
msgid "Cancel"
msgstr "Cancelar"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr ""
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "mostrar antevisão"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4540,11 +4526,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4637,7 +4622,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr ""
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5122,61 +5107,61 @@ msgstr ""
msgid "anonymous user"
msgstr "utilizador anónimo"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr ""
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr ""
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr ""
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5185,87 +5170,87 @@ msgstr ""
msgid "delete this comment"
msgstr ""
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "editar"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr ""
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "anterior"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "página atual"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "página seguinte"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "respostas de %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5274,23 +5259,23 @@ msgstr ""
msgid "Questions"
msgstr "Questões"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr ""
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5298,7 +5283,15 @@ msgstr ""
msgid "Edit question"
msgstr "Editar questão"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5382,66 +5375,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Utlizadores"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "recentes"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "por utilizador"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Nada encontrado."
@@ -5462,97 +5455,29 @@ msgid "Sign in"
msgstr "Iniciar sessão"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Gravar endereço eletrónico"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Validae endereço"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr ""
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5561,19 +5486,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5744,7 +5656,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Senha"
@@ -5763,6 +5675,12 @@ msgstr "Nova senha"
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Alterar senha"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6068,7 +5986,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6091,22 +6009,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6135,10 +6061,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6153,10 +6075,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6245,7 +6163,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Sítios"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Por favor, corrija o erro indicado."
+msgstr[1] "Por favor, corrija os erros indicados."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentação"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Terminar sessão"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Página inicial"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Definições do grupo: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6333,7 +6309,7 @@ msgid "Did not find what you were looking for?"
msgstr ""
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
+msgid "Ask your question!"
msgstr ""
#: templates/main_page/tab_bar.html:11
@@ -6380,7 +6356,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6743,7 +6719,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6878,6 +6854,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6989,24 +6994,24 @@ msgstr ""
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "localização"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "idade"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr ""
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr ""
@@ -7104,20 +7109,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7217,7 +7222,7 @@ msgstr "Responder a:"
msgid "User profile"
msgstr "Perfil do utilizador"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr ""
@@ -7233,7 +7238,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr ""
@@ -7242,11 +7247,11 @@ msgstr ""
msgid "votes"
msgstr "votos"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr ""
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7267,7 +7272,15 @@ msgstr ""
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7275,23 +7288,23 @@ msgstr ""
msgid "Contributors"
msgstr "Contribuintes"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(necessário)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr ""
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7562,23 +7575,23 @@ msgstr "definições"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7642,38 +7655,38 @@ msgstr ""
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "a senha é obrigatória"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "por favor, indique novamente a senha"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr ""
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2 dias atrás"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "ontem"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
msgstr[1] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7732,46 +7745,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr ""
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7800,113 +7817,113 @@ msgstr ""
msgid "Privacy policy"
msgstr "Política de privacidade"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr ""
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr ""
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr ""
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr ""
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr ""
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr ""
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr ""
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr ""
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr ""
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr ""
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr ""
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7915,45 +7932,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/pt/LC_MESSAGES/djangojs.po b/askbot/locale/pt/LC_MESSAGES/djangojs.po
index 737e03dc..c85c36dd 100644
--- a/askbot/locale/pt/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/pt/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr ""
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -495,202 +499,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr ""
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -753,7 +761,7 @@ msgstr ""
msgid "undo"
msgstr ""
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr ""
@@ -769,15 +777,15 @@ msgstr ""
msgid "upload file attachment"
msgstr ""
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/pt_BR/LC_MESSAGES/django.po b/askbot/locale/pt_BR/LC_MESSAGES/django.po
index dc11ce55..6c2b450c 100644
--- a/askbot/locale/pt_BR/LC_MESSAGES/django.po
+++ b/askbot/locale/pt_BR/LC_MESSAGES/django.po
@@ -3,18 +3,18 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Cuidado: depois de marcar esta opção, faça um backup do banco de dados e execute o comando de administração python manage.py fix_question_tags
para renomear as tags globalmente."
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Formato da lista de tags"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Selecione o formato para mostrar as tags, seja uma lista simples ou uma nuvem de tags"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Utilizar tags coringa"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Tags coringa podem ser utilizadas para seguir ou ignorar várias tags de uma só vez. Uma tag coringa válida contém o coringa no final."
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Número máximo padrão de comentários a exibir sob os posts"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Tamanho máximo dos comentários, deve ser < %(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Tempo limite para editar comentários"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Se desmarcado, não haverá tempo limite para editar comentários"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Nº de minutos permitidos para editar comentários"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Para ativar este recurso, marque o anterior"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Sua pergunta não pode ser postada por insuficiência de privilégios da sua conta de usuário
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Aceitar a melhor resposta para %(question_count)d das suas perguntas" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Por favor, aceite a melhor resposta para esta pergunta:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Por favor, aceite a melhor resposta para estas perguntas:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "%(question_count)d pergunta atualizada sobre %(topics)s" msgstr[1] "%(question_count)d perguntas atualizadas sobre %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3458,11 +3441,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "nova pergunta" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3485,86 +3468,86 @@ msgstr[1] "%(question_count)d não respondidas perguntas sobre %(topics)s"
msgid "Please log in to use %s"
msgstr "Faça login para utilizar %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Você não pode aceitar ou recusar melhores respostas por que sua conta está bloqueada"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Você não pode aceitar ou recusar melhores respostas por que sua conta está suspensa"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ">%(points)s pontos são necessários para aceitar ou recusar sua própria resposta a sua pergunta"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Você poderá aceitar esta resposta somente após %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Somente moderadores ou o autor original da pergunta - %(username)s - pode aceitar ou recusar a melhor resposta"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr "Não é permitido votar as próprias questões"
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Sua conta parece estar bloqueada"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Sua conta parece estar suspensa"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ">%(points)s pontos requeridos para voto a favor"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ">%(points)s pontos requeridos para voto contrário"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Usuários bloqueados não podem fazer upload de arquivos"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Usuários suspensos não podem fazer upload de arquivos"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr "Para efetuar um upload é necessário possuir um karma maior que %(min_rep)s"
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3575,57 +3558,57 @@ msgid_plural ""
msgstr[0] "Cometários (com exceção do último) podem ser editados somente antes de %(minutes)s minuto da postagem"
msgstr[1] "Cometários (com exceção do último) podem ser editados somente antes de %(minutes)s minutos da postagem"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Somente o dono da mensagem ou moderadores podem editar comentários"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Por estar com a conta suspensa, você só poderá comentar suas próprias postagens"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Para comentar qualquer postagem, é necessário um mínimo de %(min_rep)s pontos de reputação. Você ainda pode comentar suas próprias postagens e respostas a suas perguntas"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Este post foi excluído e só pode ser visto pelo proprietário, administrador do site e moderadores."
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Somente moderadores, administradores do site e o proprietário do post podem editar posts excluídos"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Por estar com a conta bloqueada, você só poderá editar suas próprias postagens"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Por estar com a conta suspensa, você só poderá editar suas próprias postagens"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Para editar postagens do wiki, é necessário um mínimo de %(min_rep)s pontos de reputação."
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Para editar postagens de outras pessoas, é necessário um mínimo de %(min_rep)s pontos de reputação."
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3635,103 +3618,103 @@ msgid_plural ""
msgstr[0] "Desculpe, não foi possível remover sua pergunta já que ela já tem um resposta votada enviada por outro usuário"
msgstr[1] "Desculpe, não foi possível remover sua pergunta já que ela já tem algumas respostas votadas enviadas por outros usuários"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Desculpe, já que sua conta está bloqueada, você não pode excluir posts"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Desculpe, já que sua conta está suspensa você pode remover somente suas próprias postagens"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Desculpe, já que sua conta está bloqueado, você não pode fechar perguntas"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Desculpe, já que sua conta está suspensa, você não pode fechar perguntas"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Desculpe, para fechar as postagens de outras pessoas, um mínimo de reputação de %(min_rep)s é necessário"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Desculpe, para fechar sua própria pergunta, um mínimo de reputação de %(min_rep)s é necessário"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Desculpe, somente administradores, moderadores ou donos de postagens com reputação > %(min_rep)s podem reabrir perguntas."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Desculpe, para reabrir sua própria pergunta, um mínimo de reputação de %(min_rep)s é necessário"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr "A pergunta só pode ser marcada uma vez"
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr "devido ao bloqueio de sua conta, você não pode marcar um conteúdo como ofensivo"
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr "Desculpe, para sinalizar postagens como ofensivas, um mínimo de reputação de %(min_rep)s é necessário."
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr "Você alcançou o limite diário de %(max_flags_per_day)s marcações por dia."
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "marcador inexistente"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr "devido ao bloqueio de sua conta, você não pode remover marcações"
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr "sua conta parece estar suspensa e você não pode remover marcações. Entre em contato com o administrador do site para solucionar o problema."
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3739,221 +3722,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "você não possui permissão para remover todas os marcadres"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "não existem marcadores para este registro"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Desculpe, somente donos de perguntas, administradores do site e moderadores podem alterar tags de perguntas removidas"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Desculpe, já que sua conta está bloqueada, você não pode reetiquetar perguntas"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Desculpe, já que sua conta está suspensa, você pode alterar tags de somente suas próprias perguntas"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Desculpe, para remarcar perguntas um mínimo de %(min_rep)s de reputação é necessário"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Desculpe, já que sua conta está bloqueada, você não pode excluir comentário"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Desculpe, como a sua conta está suspensa, você pode excluir somente seus comentários"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Desculpe, para excluir comentários, reputação de %(min_rep)s é requerido"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr "votos antigos não podem ser revogados"
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "em %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "em dois dias"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "amanhã"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "em %(hr)d hora"
msgstr[1] "em %(hr)d horas"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "em %(min)d minuto"
msgstr[1] "em %(min)d minutos"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d dia"
msgstr[1] "%(days)d dias"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Novos usuários devem esperar %(days)s antes de responderem suas próprias questões. \nVocê pode postar uma resposta em %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anônimo"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administrador do Site"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderador do Forum"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Usuário suspenso"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Usuário bloqueado"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Usuário registrado"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Usuário assistido"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Usuário aprovado"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s Karma é %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "um crachá de ouro"
msgstr[1] "%(count)d crachás de ouro"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "um crachá de prata"
msgstr[1] "%(count)d crachás de prata"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "um crachál de bronze"
msgstr[1] "%(count)d crachás de bronze"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s e %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s tem %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Parabéns, você recebeu a medalha '%(badge_name)s'. Confira em seu perfil."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Sua etiqueta subscrita foi salvo, obrigado!"
@@ -4223,49 +4206,57 @@ msgstr "Muito ativo em uma etiqueta"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Desculpe, esta pergunta foi excluída e não está mais acessível"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Desculpe, a reposta que você está procurando não está mais disponível porque a pergunta pai foi removida"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Desculpe, esta resposta foi removida e não está mais acessível"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Desculpe, o comentário que você está procurando não está mais acessível porque a pergunta pai foi removida"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "Desculpa, o comentário que você está procurando não está mais acessível porque a resposta pai foi removida"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4287,17 +4278,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4497,19 +4488,14 @@ msgstr "Editar resposta"
msgid "back"
msgstr "retornar"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revisão"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Salvar"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4517,21 +4503,21 @@ msgstr "Salvar"
msgid "Cancel"
msgstr "Cancelar"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "ocultar previw"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "preview"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr "Faça Sua Pergunta"
@@ -4544,11 +4530,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4641,7 +4626,7 @@ msgstr "silver badge: ocasionalmente concedido para as contribuições com alta
msgid "bronze badge: often given as a special honor"
msgstr "bronze badge: muitas vezes dado pelo grau de relevância"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5126,61 +5111,61 @@ msgstr "quantidade atual de votos"
msgid "anonymous user"
msgstr "usuário anônimo"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "perguntou"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "respondeu"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "postou"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "este post está marcado como wiki comunitário"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Este post é um wiki.\n Qualquer usuário que possuir karma >%(wiki_min_rep)s poderá aperfeiçoá-lo."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "atualizou"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "visualizar questões marcadas com '%(tag)s'"
@@ -5189,87 +5174,87 @@ msgstr "visualizar questões marcadas com '%(tag)s'"
msgid "delete this comment"
msgstr "remover comentário"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "ediatar"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "siga %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "deixe de seguir %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "seguindo %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s imagem gravatar"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "o website de %(username)s's é %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "anterior"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "página atual"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "página %(num)s"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "próxima"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "respostas para %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] "você recebeu %(response_count)s nova resposta"
msgstr[1] "você recebeu %(response_count)s novas respostas"
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "nenhuma nova resposta"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s new flagged posts and %(seen)s previous"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5278,23 +5263,23 @@ msgstr ""
msgid "Questions"
msgstr "Perguntas"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr "faça um comentário"
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Responda Sua Própria Pergunta"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr "Envie Sua Resposta"
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr "Faça o login para Postar"
@@ -5302,7 +5287,15 @@ msgstr "Faça o login para Postar"
msgid "Edit question"
msgstr "Editar pergunta"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5386,66 +5379,66 @@ msgstr "Assinar"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Pessoa"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Ordenar por »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "visualizar as pessoas com maior reputação"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "karma"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "visualizar os mais novos membros"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "recente"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "visualizar os mais antigos"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "ordenado por nome"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "por nome de usuário"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Nenhum resultado encontrado."
@@ -5466,97 +5459,29 @@ msgid "Sign in"
msgstr "Entrar"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "Alterar Email"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Guarde o seu endereço de e-mail"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Salvar email"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Validar email"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Enviar e-mail não mudou"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Email não modificado"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email verificado"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5565,19 +5490,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr "Email de validação não enviado"
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "registro"
@@ -5748,7 +5660,7 @@ msgid "Login or email"
msgstr "Login ou email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Senha"
@@ -5767,6 +5679,12 @@ msgstr "Nova senha"
msgid "Please, retype"
msgstr "Por favor, redigite"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Alterar senha"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6072,7 +5990,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6095,22 +6013,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6139,10 +6065,6 @@ msgstr "\n
Houve um erro ao processar a mensagem:
\n"
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6157,10 +6079,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6249,7 +6167,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Sites"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Corrija o erro abaixo"
+msgstr[1] "Corrija os erros abaixo"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Configurações incluídas em %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Sem permissão para editar valores."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentação"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Log out"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Home"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Editar configurações do site"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Livesettings foram desativados neste site."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Todas as configurações deve ser editadas no arquivo settings.py"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Grupo de configurações: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Desmembrar todos"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6337,8 +6313,8 @@ msgid "Did not find what you were looking for?"
msgstr "Não encontrou o que procurava?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Faça sua pergunta!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6384,7 +6360,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "insira ao menos %(tag_count)s tags, com até %(max_chars)s caracteres cada"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6747,7 +6723,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6882,6 +6858,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6993,24 +6998,24 @@ msgstr ""
msgid "website"
msgstr "website"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "local"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "idade"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "votos não computados de hoje"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "votos restantes"
@@ -7108,20 +7113,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] "Seguido por %(count)s pessoa"
msgstr[1] "Seguido por %(count)s pessoas"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "Seguindo %(count)s pessoa"
msgstr[1] "Seguindo %(count)s pessoas"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Seu network está vazio. Caso queira seguir alguém, acesso o perfil e clique em \"seguir\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "o network de %(username)s's está vazio"
@@ -7221,7 +7226,7 @@ msgstr "Perguntar para:"
msgid "User profile"
msgstr "Perfil"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "comentários e respostas a outras perguntas"
@@ -7237,7 +7242,7 @@ msgstr "Grafico de karma do usuário"
msgid "questions that user is following"
msgstr "perguntas que o usuário está seguindo"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "registro de votos do usuário"
@@ -7246,11 +7251,11 @@ msgstr "registro de votos do usuário"
msgid "votes"
msgstr "votos"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "configuração de assinatura de e-mail"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "moderar este usuário"
@@ -7271,7 +7276,15 @@ msgstr "tente dar uma resposta em vez de se envolver em uma discussão"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7279,23 +7292,23 @@ msgstr ""
msgid "Contributors"
msgstr "Contribuidores"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr "Um destes campos é obrigatório"
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "rótulos:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(obrigatório)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Exibir previw em tempo real do editor Markdown"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7566,23 +7579,23 @@ msgstr "configurações"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "não"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Oops, desculpe - houve algum erro"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Por favor, login para post"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "Spam foi detectado em seu post, desculpe, pois se este é um erro"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7646,38 +7659,38 @@ msgstr "este e-mail já esta sendo usado por outra pessoa, por favor escolha out
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "senha é necessária"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "Senha (novamente)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "por favor, redigite sua senha"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "Desculpe, senhas digitadas não coincidem, por favor tente novamente"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2 dias atrás"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "ontem"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "%(hr)d hora atrás"
msgstr[1] "%(hr)d horas atrás"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7736,46 +7749,50 @@ msgstr "Sua inscrição foi enviada e um email foi enviadopara %(email)s, saiba
msgid "email update frequency has been set to daily"
msgstr "frequência de atualização de e-mail foi configurada para diária"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "Subscrição de etiqueta foi cancelada (desfazer)"
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Acesse para subscrever para: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Favor conecte-se para votar"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7804,113 +7821,113 @@ msgstr "Estamos ansioos para ouvir seu comentário! Por favor, dê ele da próxi
msgid "Privacy policy"
msgstr "Política de privacidade"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Desculpe, o comentário que você está procurando foi excluído e não está mais acessível"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "moderar usuário"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "perfil do usuário"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "visão geral do perfil do usuário"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "atividade recente do usuário"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "perfil - atividade recente"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "perfil - respostas"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "perfil - votos"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "karma"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "Perfil - Karmas do Usuário"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "perguntas favoritas do usuário"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "perfil - perguntas favoritas"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "alterações salvas"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "atualizações por email canceladas"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "perfil - assinaturas de e-mail"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Usuários anônimos não podem gravar arquivos"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "os tipos de arquivos permitidos são '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "o tamanho máximo do arquivo a gravar é %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Erro ao atualizar o arquivo. Por favor entre em contato com o administrador do site. Obrigado."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7919,45 +7936,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Faça o login para responder ás perguntas"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Desculpe, você parece está desconectado e não pode postar comentários. Favor Conecte-se"
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Usuários anônimos não podem editar comentários"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Desculpe, parece que você está desconectado e não pode remover comentários. Por favor, faça seu login."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "parece que temos algumas dificuldades técnicas"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po b/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po
index 49472d5e..8a855d2e 100644
--- a/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/pt_BR/LC_MESSAGES/djangojs.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Olivier Hallot, 2012.
-# Rafael Ferreira
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Digite o título da pergunta (>10 caracteres)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -497,202 +501,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "clique para fechar"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -755,7 +763,7 @@ msgstr "barra horizontal"
msgid "undo"
msgstr "desfazer"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "refazer"
@@ -771,15 +779,15 @@ msgstr "entre com a url"
msgid "upload file attachment"
msgstr "gravar arquivo anexo"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/ro/LC_MESSAGES/django.po b/askbot/locale/ro/LC_MESSAGES/django.po
index c2a35490..443ee19a 100644
--- a/askbot/locale/ro/LC_MESSAGES/django.po
+++ b/askbot/locale/ro/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# FIRST AUTHOR python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr ""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3462,11 +3444,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "întrebare nouă" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3490,86 +3472,86 @@ msgstr[2] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Nu puteți accepta sau refuza cele mai bune răspunsuri deoarece contul dumneavoastră este blocat"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Nu puteți accepta sau refuza cele mai bune răspunsuri deoarece contul dumneavoastră este suspendat"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Contul dumneavoastră pare a fi blocat "
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Contul dumneavoastră pare a fi suspendat "
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "Sunt necesare >%(points)s puncte pentru a vota pozitiv"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "sunt necesare %(points)s puncte pentru a dezaprova"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Utilizatorii blocați nu pot încărca fișiere"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Utilizatorii suspendați nu pot încărca fișiere"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3581,57 +3563,57 @@ msgstr[0] "Comentariile (cu excepția ultimului) pot fi modificate numai într-u
msgstr[1] "Comentariile (cu excepția ultimului) pot fi modificate numai într-un interval de %(minutes)s minute de la postare"
msgstr[2] "Comentariile (cu excepția ultimului) pot fi modificate numai într-un interval de %(minutes)s de minute de la postare"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Doar cel care a adăugat mesajul și moderatorii pot modifica comentariile"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Deoarece contul dumneavoastră este suspendat, puteți comenta numai postările proprii"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "Ne pare rău, pentru a comenta la un mesaj este necesar un minim de %(min_rep)s puncte de reputație. Puteți în continuare să comentați mesajele și răspunsurile pentru întrebările proprii"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Această postare a fost ștearsă și poate fi văzută numai de către proprietari, administratorii site-ului și moderatori"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Numai moderatorii, administratorii site-ului și proprietarii postării pot modifica postările șterse"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Deoarece contul dumneavoastră este blocat, nu puteți modifica postările"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Deoarece contul dumneavoastră este suspendat, puteți modifica numai postările proprii"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "Pentru a modifica wiki-ul, este necesar un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Ne pare rău, pentru a modifica mesajele altor utilizatori este nevoie de un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3642,103 +3624,103 @@ msgstr[0] "Nu puteți șterge întrebarea deoarece beneficiază de un răspuns v
msgstr[1] "Nu puteți șterge întrebarea deoarece beneficiază de răspunsuri votate pozitiv de alți utilizatori."
msgstr[2] "Nu puteți șterge întrebarea deoarece beneficiază de răspunsuri votate pozitiv de alți utilizatori."
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Deoarece contul dumneavoastră este blocat, nu puteți șterge postări"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Deoarece contul dumneavoastră este suspendat, puteți șterge numai postările proprii"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Deoarece contul dumneavoastră este blocat, nu puteți închide întrebări"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Deoarece contul dumneavoastră este suspendat, nu puteți închide întrebări"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "Ne pare rău, pentru a închide mesajele altor utilizatori este nevoie de un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "Ne pare rău, pentru a închide propria întrebare este nevoie de un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "Ne pare rău, doar administratorii, moderatorii și proprietarii mesajelor cu o reputație de minim %(min_rep)s puncte de reputație pot redeschide întrebări."
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "Ne pare rău, pentru a redesche propria întrebare este nevoie de un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3747,67 +3729,67 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "Numai proprietarii întrebării, administratorii site-ului și moderatorii pot reeticheta întrebările șterse"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Deoarece contul dumneavoastră este blocat, nu puteți reeticheta întrebări"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Deoarece contul dumneavoastră este suspendat, puteți reeticheta numai întrebările proprii"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "Ne pare rău, pentru a reeticheta întrebări este nevoie de un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Deoarece contul dumneavoastră este blocat, nu puteți șterge comentarii"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Deoarece contul dumneavoastră este suspendat, puteți șterge numai propriile comentarii"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Ne pare rău, pentru a șterge un comentariu este nevoie de un minim de %(min_rep)s puncte de reputație"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "în %(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
@@ -3815,7 +3797,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
@@ -3823,7 +3805,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
@@ -3831,51 +3813,51 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anonim"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Administrator"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Moderator"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Utilizator suspendat"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Utilizator blocat"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Utilizator înregistrat"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Utilizator urmărit"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Utilizator aprobat"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s are %(reputation)s puncte de reputație"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
@@ -3883,7 +3865,7 @@ msgstr[0] "o insignă de aur"
msgstr[1] "%(count)d insigne de aur"
msgstr[2] "%(count)d de insigne de aur"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
@@ -3891,7 +3873,7 @@ msgstr[0] "o insignă de argint"
msgstr[1] "%(count)d insigne de argint"
msgstr[2] "%(count)d de insigne de argint"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
@@ -3899,17 +3881,17 @@ msgstr[0] "o insignă de bronz"
msgstr[1] "%(count)d insigne de bronz"
msgstr[2] "%(count)d de insigne de bronz"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s și %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s are %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
@@ -3917,58 +3899,58 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Felicitări, ați obținut o insignă „%(badge_name)s”. Verificați profilul propriu."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Abonarea la etichetă a fost salvată!"
@@ -4238,49 +4220,57 @@ msgstr "Foarte activ pe o anumită etichetă"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Ne pare rău, această întrebare a fost ștearsă și nu mai este accesibilă"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "Ne pare rău, răspunsul pe care îl cautați nu mai etse disponibil deoarece întrebarea asociată a fost ștearsă"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Ne pară rău, această întrebarea a fost ștearsă și nu mai este accesibilă"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "Ne pare rău, comentariu pe care îl cautați nu mai este accesibil deoarece întrebarea asociată a fost ștearsă"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "Ne pare rău, comentariul pe care îl cautați nu mai este accesibil deoarece răspunsul asociat a fost șters"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4303,17 +4293,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4513,19 +4503,14 @@ msgstr "Modifică răspuns"
msgid "back"
msgstr "înapoi"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revizie"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Salvează modificările"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4533,21 +4518,21 @@ msgstr "Salvează modificările"
msgid "Cancel"
msgstr "Anulează"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "ascunde previzualizarea"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "arată previzualizarea"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4560,11 +4545,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4658,7 +4642,7 @@ msgstr "insignă de argint: acordată ocazional pentru contribuții de cea mai b
msgid "bronze badge: often given as a special honor"
msgstr "insignă de argint: acordată adesea pentru a onora pe cineva într-un mod special"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5143,61 +5127,61 @@ msgstr "număr actual de voturi"
msgid "anonymous user"
msgstr "utilizator anonim"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "întrebat"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "răspuns"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "adăugat"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "acest text este marca drep un wiki al comunității"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Acesta este o pagină wiki.\n Oricine cu o reputație mai mare decât %(wiki_min_rep)s este binevenit să o imbunătățească."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "actualizat"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "afișează întrebările etichetate „%(tag)s”"
@@ -5206,66 +5190,66 @@ msgstr "afișează întrebările etichetate „%(tag)s”"
msgid "delete this comment"
msgstr "șterge acest comentariu"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "modifică"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "imagine gravatat %(username)s"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "Pagina web pentru %(username)s este %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "precedentă"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "pagiona curentă"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "pagina următoare"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "răspunsuri pentru %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
@@ -5273,21 +5257,21 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "încă nici un răspuns nou"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s postări noi marcate și %(seen)s anterioare"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s postări noi marcate"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s (de) postări marcate"
@@ -5296,23 +5280,23 @@ msgstr "%(seen)s (de) postări marcate"
msgid "Questions"
msgstr "Întrebări"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Răspunde propriei întrebări"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5320,7 +5304,15 @@ msgstr ""
msgid "Edit question"
msgstr "Modifică întrebarea"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5404,66 +5396,66 @@ msgstr "Abonare"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Utilizatori"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "reputație"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "recent"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "după nume de utilizator"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Nu s-a găsit nimic."
@@ -5484,97 +5476,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Salvați adresa de email"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Salvează adresa de e-mail"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Validează adresa de e-mail"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Adresa de e-mail nu a fost schimbată"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Adresa de e-mail a fost schimbată"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Adresa de e-mail a fost verificată"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5583,19 +5507,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Înregistrare"
@@ -5766,7 +5677,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Parolă"
@@ -5785,6 +5696,12 @@ msgstr "Parolă nouă"
msgid "Please, retype"
msgstr "introduceți din nou"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Schimbă parola"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6090,7 +6007,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6114,22 +6031,30 @@ msgstr[2] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6158,10 +6083,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6176,10 +6097,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6268,7 +6185,66 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Pagini web"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Corectați eroarea de mai jos"
+msgstr[1] "Corectați erorile de mai jos"
+msgstr[2] "Corectați erorile de mai jos"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Configurări incluse în %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Nu aveți permisiunea de a edita valorile"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Documentație"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Ieșire"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Acasă"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Editați configurările site-ului"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Configurările live sunt dezactivate pentru acest site"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Toate opțiunile de configurare trebuie editate în fișierul site-ului settings.py"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Configurări grup: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Restrânge tot"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6357,8 +6333,8 @@ msgid "Did not find what you were looking for?"
msgstr "Nu ați găsit ceea ce căutați?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Vă rugăm să puneți o întrebare!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6406,7 +6382,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6771,7 +6747,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6906,6 +6882,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -7017,24 +7022,24 @@ msgstr "văzut ultima dată"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "locație"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "vârstă"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "voturi nefolosite azi"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "voturi rămase"
@@ -7133,7 +7138,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
@@ -7141,13 +7146,13 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7253,7 +7258,7 @@ msgstr ""
msgid "User profile"
msgstr "Profil utilizator"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "comentarii și răspunsuri pentru întrebările altora"
@@ -7269,7 +7274,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "istoria voturilor utilizatorului"
@@ -7278,11 +7283,11 @@ msgstr "istoria voturilor utilizatorului"
msgid "votes"
msgstr "voturi"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "configurări abonament email"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "moderează acest utilizator"
@@ -7303,7 +7308,15 @@ msgstr "încercați să oferiți un răspuns, nu să vă angajați într-o discu
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7311,23 +7324,23 @@ msgstr ""
msgid "Contributors"
msgstr "Contribuitori"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(obligatoriu)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Comută previzualizare în timp real pentru textul Markdown"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7601,23 +7614,23 @@ msgstr "configurări"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Oops, ne cerem scuze - a apărut o eroare"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7681,31 +7694,31 @@ msgstr "această adresă de email este deja folosită de un alt utilizator, folo
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "parola este obligatorie"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "retastați parola"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "ne pare rău, parolele tastate nu sunt identice, încercați din nou"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "acum 2 zile"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "ieri"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
@@ -7713,7 +7726,7 @@ msgstr[0] "acum %(hr)d oră"
msgstr[1] "acum %(hr)d ore"
msgstr[2] "acum %(hr)d de ore"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7773,46 +7786,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "frecvența de actualizare a emailurilor a fost definită drept zilnic"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "Abonomanetul la etichetă a fost anulat (refă)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Vă rugăm să vă autentificați pentru a vă abona la: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7841,113 +7858,113 @@ msgstr "Suntem interesați de sugestiile voastre!"
msgid "Privacy policy"
msgstr "Politica de confidențialitate"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Ne pare rău, comentariul pe care îl căutați a fost șters nu mai este accesibil"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "moderează utilizator"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "profil utilizator"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "privire de ansamblu profil utilizator"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "activitate recentă utilizator"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profil - activitate recentă"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profil - răspunsuri"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profil - voturi"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "întrebările favorite ale utilizatorului"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profile - întrebări favorite"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "schimbările au fost salvate"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "actualizările email au fost anulate"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profil - abonamente email"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Utilizatorii anonimi nu pot încărca fișiere"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "tipurile de fișiere permise sunt „%(file_types)s”"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "mărimea maximă a fișierului încărcat este %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Eroare la încărcarea fișierului. Vă rugăm să contactați administratorii siteului. Vă mulțumim."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7956,45 +7973,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Nu sunteți autentificat și nu puteți adăuga comentarii . Vă rugăm să vă autentificați."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Utilizatorii anonimi nu pot modifica comentariile"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Nu sunteți autentificat și nu puteți șterge comentarii . Vă rugăm să vă autentificați."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "ne pare rău dar se pare că avem unele dificultăți tehnice"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/ru/LC_MESSAGES/django.po b/askbot/locale/ru/LC_MESSAGES/django.po
index ba3998b8..166842f9 100644
--- a/askbot/locale/ru/LC_MESSAGES/django.po
+++ b/askbot/locale/ru/LC_MESSAGES/django.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-04-30 20:00+0000\n"
-"Last-Translator: masdzen python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Внимание: после того как отметите эту опцию, пожалуйста, зарезервируйте свою базу данных и запустите команду: python manage.py fix_question_tags
чтобы глобально переименовать тэги"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "Формат списка тэгов"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Выберите формат, в котором будут отображаться тэги: обычный список или \"облако\" тэгов"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Использовать тэги со \"звездочкой\""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Тэги со \"звездочкой\" могут быть использованы чтобы выбрать или отменить выбор многих тэгов за раз, у правильного тэга со \"звездочкой\" есть только одна \"звездочка\" в самом конце"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr "Используйте разделение для тэгов подписки"
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr "Если включено, пользователи будут иметь 3 варианта работы с тэгами: \"подписка\" (по электронной почте), добавление в \"интересные\" и \"игнорирование\""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr "Всегда, для всех пользователей"
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr "Никогда, для всех пользователей"
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr "Пусть решит пользователь"
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr "Сделать общедоступным пользовательский выбор тэгов"
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr "Включить поиск по тэгам в отдельном блоке на главной странице"
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Число комментариев по-умолчанию, которое показывается под сообщениями"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Максимальная длина комментария не должна превышать %(max_len)s символов"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Ограничить время на редактирование комментариев"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Если галочка снята, время на редактирование комментариев не будет ограничено"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Время на редактирование комментария в минутах"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Чтобы включить эту настройку также включите предыдущую"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Извините, ваш вопрос невозможно добавить, поскольку у вашей учетной записи недостаточно прав
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "Принять лучший ответ для %(question_count)d ваших вопросов" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "Пожалуйста, старайтесь давать ответы по-существу. Если вы хотите обсудить вопрос или ответ, используйте комментирование. Пожалуйста, помните, что вы всегда можете пересмотреть свой вопрос - нет нужды задавать один и тот же вопрос дважды. Кроме того, пожалуйста, не забывайте голосовать - это действительно помогает выбрать лучшие вопросы и ответы!" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "Пожалуйста, старайтесь давать ответы по-существу. Если вы хотите обсудить вопрос или ответ, используйте комментирование. Пожалуйста, помните, что вы всегда можете пересмотреть свой вопрос - нет нужды задавать один и тот же вопрос дважды. Кроме того, пожалуйста, не забывайте голосовать - это действительно помогает выбрать лучшие вопросы и ответы!" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" @@ -3454,7 +3436,7 @@ msgstr[0] "%(question_count)d вопрос обновлен в %(topics)s" msgstr[1] "%(question_count)d вопросы обновлены в %(topics)s" msgstr[2] "%(question_count)d вопросы обновлены в %(topics)s" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3466,11 +3448,11 @@ msgstr[0] "
Уважаемый %(name)s,
Следующий вопрос msgstr[1] "
Уважаемый %(name)s,
Следующие %(num)d вопроса были обновлены на %(sitename)s:
" msgstr[2] "Уважаемый %(name)s,
Следующие %(num)d вопросов были обновлены на %(sitename)s:
" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "новый вопрос" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3494,86 +3476,86 @@ msgstr[2] "%(question_count)d неотвеченных вопросов на т
msgid "Please log in to use %s"
msgstr "Пожалуйста войдите чтобы использовать %s"
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "К сожалению, вы не можете принять или не принять лучший ответ, потому что ваша учетная запись заблокирована"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "К сожалению, вы не можете принять или не принять лучший ответ, потому что ваша учетная запись приостановлена"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ">%(points)s очков необходимо чтобы принять или отклонить ваш собственный ответ на ваш собственный вопрос"
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Извините, вы сможете принять этот ответ только через %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "Извините, только модераторы или автор вопроса - %(username)s - могут принимать или отклонять лучший ответ"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr "Простите, Вы не можете голосовать за свои же сообщения"
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "К сожалению, ваша учетная запись заблокирована"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "К сожалению, ваша учетная запись приостановлена"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "для повышения рейтинга требуется минимум %(points)s баллов "
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "для понижения рейтинга требуется минимум %(points)s баллов"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "К сожалению, заблокированные пользователи не могут загружать файлы"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "К сожалению, временно блокированные пользователи не могут загружать файлы"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr "простите, загрузка файлов требует >%(min_rep)s очков репутации"
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3585,57 +3567,57 @@ msgstr[0] "Извините, комментарии (кроме последне
msgstr[1] "Извините, комментарии (кроме последнего) можно редактировать только %(minutes)s минуты после добавления"
msgstr[2] "Извините, комментарии (кроме последнего) можно редактировать только %(minutes)s минут после добавления"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "К сожалению, только владелец или модератор может редактировать комментарий"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "К сожалению, так как ваш аккаунт приостановлен вы можете комментировать только свои собственные сообщения"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "К сожалению, для комментирования любого сообщения требуется %(min_rep)s баллов репутации. Вы можете комментировать только свои собственные сообщения и ответы на ваши вопросы"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Этот пост был удален, его может увидеть только владелец, администраторы сайта и модераторы"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Извините, только модераторы, администраторы сайта и владельцы сообщения могут редактировать удаленные сообщения"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "К сожалению, так как Ваш учетная запись заблокирована Вы не можете редактировать сообщения"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "К сожалению, так как ваша учетная запись приостановлена вы можете редактировать только ваши собственные сообщения"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "К сожалению, для редактирования вики сообщений, требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "К сожалению, для редактировать сообщения других пользователей, требуется %(min_rep)s балов кармы"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3646,103 +3628,103 @@ msgstr[0] "К сожалению, Вы не может удалить ваш в
msgstr[1] "К сожалению, Вы не может удалить ваш вопрос, поскольку на него ответили другие пользователи и их ответы получили положительные голоса"
msgstr[2] "К сожалению, Вы не может удалить ваш вопрос, поскольку на него ответили другие пользователи и их ответы получили положительные голоса"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "К сожалению, так как Ваша учетная запись заблокирована Вы не можете удалять сообщения"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "К сожалению, так как Ваша учетная запись приостановлена Вы не можете удалять сообщения"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "К сожалению, так как Ваша учетная запись заблокирована вы не можете закрыть вопросы"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "К сожалению, так как Ваша учетная запись приостановлена вы не можете закрыть вопросы"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "К сожалению, для закрытия сообщения других пользователей, требуется %(min_rep)s балов кармы"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "К сожалению, для закрытия своего вопроса, требуется %(min_rep)s балов кармы"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "К сожалению, только администраторы, модераторы или владельцы с кармой >%(min_rep)s может открыть вопрос"
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "К сожалению, чтобы вновь открыть собственный вопрос требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr "Вы уже пометили этот вопрос и не можете сделать это несколько раз"
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr "Простите, поскольку Ваш аккаунт заблокирован, Вы не можете помечать сообщения как нарушающие правила"
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr "Простите, чтобы помечать сообщения как нарушающие правила, требуется минимум %(min_rep)s очков репутации"
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr "Простите, Вы израсходовали максимальное число отметок о нарушении правил за день - %(max_flags_per_day)s штук"
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "нельзя удалить несуществующий флаг"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr "Простите, поскольку Ваш аккаунт заблокирован, Вы не можете удалять отметки"
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr "Простите, поскольку Ваш аккаунт приостановлен, Вы не можете удалять отметки.\nОбратитесь к администратору форума за разрешением ситуации."
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3751,67 +3733,67 @@ msgstr[0] "Простите, чтобы пометить сообщение тр
msgstr[1] "Простите, чтобы пометить сообщение требуется минимум %(min_rep)d очка репутации"
msgstr[2] "Простите, чтобы пометить сообщение требуется минимум %(min_rep)d очков репутации"
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "у вас нету прав чтобы удалить все обжалованные сообщения"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "без заметок на эту запись"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "К сожалению, только владельцы, администраторы сайта и модераторы могут менять теги к удаленным вопросам"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "К сожалению, так как Ваша учетная запись заблокирована вы не можете поменять теги вопроса "
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "К сожалению, так как Ваша учетная запись приостановлена вы можете менять теги только на свои вопросы"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "К сожалению, для изменения тегов требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "К сожалению, так как Ваша учетная запись заблокирована Вы не можете удалять комментарий"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "К сожалению, так как Ваша учетная запись приостановлена вы можете удалять только ваши собственные комментарии"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "К сожалению, для удаления комментариев требуется %(min_rep)s баллов репутации"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr "простите, но старые голоса не могут быть отозваны"
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "%(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "через два дня"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "завтра"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
@@ -3819,7 +3801,7 @@ msgstr[0] "через %(hr)d час"
msgstr[1] "через %(hr)d часа"
msgstr[2] "через %(hr)d часов"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
@@ -3827,7 +3809,7 @@ msgstr[0] "через %(min)d минуту"
msgstr[1] "через %(min)d минуты"
msgstr[2] "через %(min)d минут"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
@@ -3835,51 +3817,51 @@ msgstr[0] "%(days)d день"
msgstr[1] "%(days)d дня"
msgstr[2] "%(days)d дней"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "Новые пользователи должны подождать %(days)s дней прежде чем получат возможность ответить на свой собственный вопрос. Вы можете ответить через %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Аноним"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Администратор сайта"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "С уважением, Модератор форума"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Приостановленный пользователь "
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Заблокированный пользователь"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Зарегистрированный пользователь"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Видный пользователь"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Утвержденный Пользователь"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "Репутация пользователя %(username)s равна %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
@@ -3887,7 +3869,7 @@ msgstr[0] "%(count)d золотая награда"
msgstr[1] "%(count)d золотых наград"
msgstr[2] "%(count)d золотых наград"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
@@ -3895,7 +3877,7 @@ msgstr[0] "%(count)d серебряная награда"
msgstr[1] "%(count)d серебряных наград"
msgstr[2] "%(count)d серебряных медалей"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
@@ -3903,17 +3885,17 @@ msgstr[0] "%(count)d бронзовая награда"
msgstr[1] "%(count)d бронзовых медалей"
msgstr[2] "%(count)d бронзовых медалей"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s и %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "У пользователя %(user)s - %(badges)s наград"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
@@ -3921,58 +3903,58 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "\"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Поздравляем, вы получили '%(badge_name)s'. Проверьте свой профиль."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Ваша подписка на тэги была сохранена"
@@ -4242,49 +4224,57 @@ msgstr "Очень активен в одном теге"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Извините, вопрос удалён и больше не доступен"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "К сожалению, ответ который вы ищете больше не доступен, потому что вопрос был удален"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "К сожалению, этот ответ был удален и больше не доступен"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "К сожалению, комментарии который вы ищете больше не доступны, потому что вопрос был удален"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "К сожалению, комментарий который Вы ищете больше не доступен, потому что ответ был удален"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4307,17 +4297,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4517,19 +4507,14 @@ msgstr "Править ответ"
msgid "back"
msgstr "назад"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "версия правки"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Сохранить"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4537,21 +4522,21 @@ msgstr "Сохранить"
msgid "Cancel"
msgstr "Отменить"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "скрыть предварительный просмотр"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "показать предварительный просмотр"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr "Задать вопрос"
@@ -4564,11 +4549,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4662,7 +4646,7 @@ msgstr "серебряная награда: как правило, присуж
msgid "bronze badge: often given as a special honor"
msgstr "бронзовая награда: часто даётся за особые заслуги"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5147,61 +5131,61 @@ msgstr "текущее число голосов"
msgid "anonymous user"
msgstr "анонимный пользователь"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "спросил"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "ответил"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "опубликовал"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "пост отмечен как вики сообщества"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Это wiki-сообщение.\n Любой пользователь с репутацией >%(wiki_min_rep)s может улучшить его."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "обновил"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "смотри вопросы с тегами '%(tag)s' "
@@ -5210,66 +5194,66 @@ msgstr "смотри вопросы с тегами '%(tag)s' "
msgid "delete this comment"
msgstr "удалить этот комментарий"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "редактировать"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "подписатся %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "отменить подписку %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "подписан %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s Gravatar"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr "сайт %(username)s это %(url)s"
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "предыдущая"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "текущая страница"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr "страница %(num)s"
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "следующая страница"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "ответы пользователю %(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
@@ -5277,21 +5261,21 @@ msgstr[0] "у Вас %(response_count)s новый ответ"
msgstr[1] "у Вас %(response_count)s новых ответа"
msgstr[2] "у Вас %(response_count)s новых ответов"
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "новых ответов нет"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s новых помеченых сообщений и %(seen)s предыдущих"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s новых неуместных сообщений"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "%(seen)s неуместных сообщений"
@@ -5300,23 +5284,23 @@ msgstr "%(seen)s неуместных сообщений"
msgid "Questions"
msgstr "Вопросы"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr "оставить комментарий"
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Ответьте на собственный вопрос"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr "Оставить ответ"
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr "Войдите / Зарегистрируйтесь чтобы оставить сообщение"
@@ -5324,7 +5308,15 @@ msgstr "Войдите / Зарегистрируйтесь чтобы оста
msgid "Edit question"
msgstr "Изменить вопрос"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5408,66 +5400,66 @@ msgstr "Подписаться"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Пользователи"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "Сорт. по »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "показать пользователей с наивысшим рейтингом"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "репутации"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "посмотреть пользователей которые присоединились недавно"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "новичкам"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "посмотреть пользователей которые присоединились ранее"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "показать пользователей отсортированными по имени"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "имени"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Ничего не найдено."
@@ -5488,97 +5480,29 @@ msgid "Sign in"
msgstr "Войти"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr "Сменить Email"
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "Сохранить адрес электронной почты"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr "Введите ваш новый email-адрес в строку ниже, если захотите использовать другой адрес для рассылки новостей.\n
Сейчас Вы используете %%(email)s"
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr "Пожалуйста, введите Ваш email-адрес в поле ниже.\nПодтвержденный email-адрес требуется на этом Q&A форуме. Вы также можете получать обновления интересующих Вас вопросов или всего форума. Также, Ваш email-адрес используется для создания уникального граватара - изображения для Вашей учетной записи. Email-адреса никогда не отображаются и не передаются никому другому."
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr "Ваш новый Email-адрес: \n(не будет отображаться никому, но должен быть подтвержданным)"
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "Сохранить Email"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "Проверить email-адрес"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr "Сообщение с ссылкой для подтверждения email-адреса было отправлено на %%(email)s. Пожалуйста, пройдите по ссылке в сообщении с помощью Вашего web-браузера. Подтверждение Email-адреса необходимо, чтобы убедиться в правильном использовании email на Q&A форуме. Если Вы хотите использовать \nдругой email, пожалуйста смените его снова."
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "Email не изменился"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr "Ваш электронный адрес %%(email)s не был измененесли Вы решите изменить его позже - Вы всегда можете сделать это в настройках профиля или используя предыдущую форму снова."
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "Email изменен"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr "\nВаш почтовый ящик изменен на %%(email)s. \nОбновления на наиболее понравившиеся Вам вопросы будут отправлены на этот адрес. Уведомления по электронной почте отправляются один раз в день или реже - только когда есть какие то новости."
+"href='%(change_email_url)s'>change it again."
+msgstr ""
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email проверен"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5587,19 +5511,6 @@ msgid ""
"or less frequently."
msgstr "Спасибо за подтверждение Вашего электронного адреса! Теперь Вы можете задавать и отвечать на вопросы. Так же если Вы найдете интересные вопросы Вы можете подписаться на обновления к ним - тогда мы будем оповещать Вас о изменениях раз в день\nили реже."
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr "Сообщение с подтверждением не отправлено"
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr "Ваш текущий email-адрес %%(email)s уже был подтвержден ранее поэтому новый ключ не был отослан. Если это необходимо, Вы можете сменить email-адрес."
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "Регистрация"
@@ -5770,7 +5681,7 @@ msgid "Login or email"
msgstr "Логин или email"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Пароль"
@@ -5789,6 +5700,12 @@ msgstr "Новый пароль "
msgid "Please, retype"
msgstr "Пожалуйста, повторите"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Изменить пароль"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6094,7 +6011,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6118,22 +6035,30 @@ msgstr[2] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6162,10 +6087,6 @@ msgstr "\n
Система не смогла обработать Ваше со
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6180,10 +6101,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6272,7 +6189,66 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Сайты"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Пожалуйста исправте ошибку ниже."
+msgstr[1] "Пожалуйста исправте ошибки ниже."
+msgstr[2] "Пожалуйста исправте ошибки ниже."
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Настройки включены в %(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "У вас нет разрешения на изменение значений."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Документация"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Выйти"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Главная"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Редактировать настройки сайта"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Livesettings отключены для этого сайта."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Все параметры конфигурации должны быть изменены в файле settings.py"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Настройки группы: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Развернуть все"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6361,8 +6337,8 @@ msgid "Did not find what you were looking for?"
msgstr "Не нашли то, что искали?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Тогда задайте свой вопрос!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6410,7 +6386,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "пожалуйста используйте до %(tag_count)s тегов, меньше чем %(max_chars)s символов каждый"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6775,7 +6751,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6910,6 +6886,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -7021,24 +7026,24 @@ msgstr "последнее посещение"
msgid "website"
msgstr "web-страница"
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "местоположение"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "возраст"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "неиспользованных голосов"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "голосов осталось"
@@ -7137,7 +7142,7 @@ msgstr[0] "Подписан %(count)s человек"
msgstr[1] "Подписано %(count)s человек"
msgstr[2] "Подписаны %(count)s человек"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
@@ -7145,13 +7150,13 @@ msgstr[0] "Отслеживается %(count)s пользователем"
msgstr[1] "Отслеживается %(count)s пользователями"
msgstr[2] "Отслеживается %(count)s пользователями"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "Ваша сеть пуста. Хотите подписатся на какого то пользователя? Посетите его профиль и нажмите \"Пописатся\""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "%(username)s's сеть пуста"
@@ -7257,7 +7262,7 @@ msgstr "Ответить:"
msgid "User profile"
msgstr "Профиль пользователя"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "комментарии и ответы на другие вопросы"
@@ -7273,7 +7278,7 @@ msgstr "График репутации пользователя"
msgid "questions that user is following"
msgstr "вопросы отслеживаемые пользователем"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "голос пользователя"
@@ -7282,11 +7287,11 @@ msgstr "голос пользователя"
msgid "votes"
msgstr "голоса"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "настройки подписки по email"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "Модерировать этого пользователя"
@@ -7307,7 +7312,15 @@ msgstr "постарайтесь ответить, а не заниматься
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7315,23 +7328,23 @@ msgstr ""
msgid "Contributors"
msgstr "Авторы"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ", один из этих тэгов необходим"
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr "тэги:"
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(обязательно)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Включить/выключить предварительный просмотр текста"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7605,23 +7618,23 @@ msgstr "настройки"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr "нет"
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Извините, произошла ошибка!"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Пожалуйста, войдите чтобы оставить сообщение"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "В вашем сообщении обнаружен спам, простите, если произошла ошибка."
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7685,31 +7698,31 @@ msgstr "этот email уже используется кем-то еще, по
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "пароль обязателен"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr "Пароль (пожалуйста, введите снова)"
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "пожалуйста, повторите свой пароль"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "к сожалению, пароли не совпадают, попробуйте еще раз"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2 дня назад"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "вчера"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
@@ -7717,7 +7730,7 @@ msgstr[0] "%(hr)d час назад"
msgstr[1] "%(hr)d часов назад"
msgstr[2] "%(hr)d часа назад"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7777,46 +7790,50 @@ msgstr "Ваша подписка сохранена, но email-адрес %(em
msgid "email update frequency has been set to daily"
msgstr "частота обновлений по email была установлена в ежедневную"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "Подписка на тэги была отменена (вернуть)."
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "Пожалуйста, войдите чтобы подписаться на: %(tags)s"
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Пожалуйста, войдите чтобы проголосовать"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr "Пожалуйста, войдите чтобы удалять/восстанавливать сообщения"
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7845,113 +7862,113 @@ msgstr "Мы с нетерпением ждем ваших отзывов!"
msgid "Privacy policy"
msgstr "Политика конфиденциальности"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Извините, но запрашиваемый комментарий был удалён"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "модерировать пользователя"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "профиль пользователя"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "обзор профиля пользователя"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "последние данные по активности пользователя"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "профиль - последние данные по активности"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "профиль - ответы"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "профиль - голоса"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr "репутация пользователя"
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr "Профиль - Репутация Пользователя"
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "избранные вопросы пользователей"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "профиль - избранные вопросы"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "изменения сохранены"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "обновления по email отменены"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "профиль - подписки"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Неавторизованные пользователи не могут загружать файлы"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "допустимые типы файлов: '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "максимальный размер загружаемого файла - %(file_size)s K"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Ошибка при загрузке файла. Пожалуйста, свяжитесь с администрацией сайта."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7960,45 +7977,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr "Вы можете задавать Ваши вопросы анонимно. Когда Вы подтвердите сообщение , Вас перенаправит на страницу авторизации. Ваше сообщение будет сохранено в ткущей сессии и опубликовано после того как вы авторизируетесь. Процесс авторизации очень прост. Авторизация занимает около 30 секунд, регистрация занимает минуту или меньше."
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Пожалуйста, старайтесь давать ответы по-существу. Если вы хотите обсудить вопрос или ответ, используйте комментирование. Пожалуйста, помните, что вы всегда можете пересмотреть свой вопрос - нет нужды задавать один и тот же вопрос дважды. Кроме того, пожалуйста, не забывайте голосовать - это действительно помогает выбрать лучшие вопросы и ответы!"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Извините, вы не вошли, поэтому не можете оставлять комментарии. Войдите."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Неавторизованные пользователи не могут исправлять комментарии"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Извините, вы не вошли, поэтому не можете удалять комментарии. Войдите."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Извините, у нас определённые технические проблемы."
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/ru/LC_MESSAGES/djangojs.po b/askbot/locale/ru/LC_MESSAGES/djangojs.po
index a92cef67..20f1f7b7 100644
--- a/askbot/locale/ru/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/ru/LC_MESSAGES/djangojs.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-29 21:59+0000\n"
-"Last-Translator: masdzen
"
-msgstr "Вы всегда можете комментировать свои вопросы.
"
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr "пожалуйста, войдите или зарегистрируйтесь, чтобы оставить комментарий"
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Пожалуйста, введите заголовок вопроса (>10 символов)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr "сохранить"
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr "Указать путь до логотипа или загрузить изображение"
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr "Вы действительно хотите удалить это изображение?"
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr "изменить логотип"
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr "добавить логотип"
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr "тэг \"%s\" уже есть, не стоит повторять его (нажмите \"escape\" чтобы удалить)"
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
@@ -363,43 +367,43 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr "Удалить категорию?"
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr "редактировать"
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr "пожалуйста, введите хотя бы один тэг"
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr "уже есть на этом уровне!"
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr "добавить категорию"
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr "сохранить тэги"
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr "Имя пользователя:"
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr "Название группы:"
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr "Сделать доступным для следующих пользователей:"
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr "Сделать доступным для следующих групп:"
@@ -508,195 +512,199 @@ msgstr "добавить группу"
msgid "add"
msgstr "добавить"
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr "и"
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "нажмите чтобы закрыть"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr "кликнуть, чтобы изменить комментарий"
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr "преобразовать в ответ"
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr "Да"
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr "Отменить"
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr "Загрузка файла: %s"
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr "Выберите другое изображение"
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr "Выберите другой файл"
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr "Упс, кажется мы допустили ошибку. Просим прощения."
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr "Выберите изоражение для вставки"
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr "Выберите файл для вставки"
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr "Разрешены следующие типы файлов:"
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr "Или скопируйте url файла сюда"
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr "Сохранить"
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr "сохранено"
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr "включено"
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr "отключено"
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr "Группа %(name)s уже существует. Название группы не чувствительно к регистру."
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr "посмотреть вопросы, помеченные тэгом '%s'"
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr "назад"
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr "теперь"
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr "около минуты"
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr "%d минут"
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr "около часа"
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr "%d часов"
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr "вчера"
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr "%d дней"
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr "около месяца"
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr "%d месяцев"
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr "около года"
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr "%d лет"
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr "Янв"
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr "Фев"
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr "Мар"
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr "Апр"
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr "Май"
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr "Июн"
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr "Июл"
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr "Авг"
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr "Сен"
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr "Окт"
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr "Ноя"
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr "Дек"
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr "2 дня спустя"
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
@@ -704,7 +712,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -768,7 +776,7 @@ msgstr "горизонтальная линия"
msgid "undo"
msgstr "отменить"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "повторить"
@@ -784,15 +792,15 @@ msgstr "введите Web-адрес, например http://www.example.com \
msgid "upload file attachment"
msgstr "Пожалуйста, выберите и загрузите файл:"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr "описание изображения"
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr "имя файла"
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr "текст ссылки"
diff --git a/askbot/locale/sr/LC_MESSAGES/django.po b/askbot/locale/sr/LC_MESSAGES/django.po
index 8e2a36b9..022d68b5 100644
--- a/askbot/locale/sr/LC_MESSAGES/django.po
+++ b/askbot/locale/sr/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Aleksandar, 2010.
+# Aleksandar, 2010
msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 09:59-0500\n"
+"PO-Revision-Date: 2013-05-18 18:48+0000\n"
"Last-Translator: evgeny python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr ""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Число комментариев по-умолчанию, которое показывается под сообщениями"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Максимальная длина комментария не должна превышать %(max_len)s символов"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3462,11 +3444,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "ново питање" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3490,86 +3472,86 @@ msgstr[2] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "К сожалению, вы не можете принять или не принять лучший ответ, потому что ваша учетная запись заблокирована"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "К сожалению, вы не можете принять или не принять лучший ответ, потому что ваша учетная запись приостановлена"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "К сожалению, ваша учетная запись заблокирована"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "К сожалению, ваша учетная запись приостановлена"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "для повышения рейтинга требуется минимум %(points)s баллов "
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "для понижения рейтинга требуется минимум %(points)s баллов"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3581,57 +3563,57 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "К сожалению, только владелец или модератор может редактировать комментарий"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "К сожалению, так как ваш аккаунт приостановлен вы можете комментировать только свои собственные сообщения"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "К сожалению, для комментирования любого сообщения требуется %(min_rep)s балов кармы. Вы можете комментировать только свои собственные сообщения и ответы на ваши вопросы"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Этот пост был удален, его может увидеть только владелец, администраторы сайта и модераторы"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Извините, только модераторы, администраторы сайта и владельцы сообщения могут редактировать удаленные сообщения"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "К сожалению, так как Ваш учетная запись заблокирована Вы не можете редактировать сообщения"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "К сожалению, так как ваша учетная запись приостановлена вы можете редактировать только ваши собственные сообщения"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "К сожалению, для редактирования вики сообщений, требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "К сожалению, для редактировать сообщения других пользователей, требуется %(min_rep)s балов кармы"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3642,103 +3624,103 @@ msgstr[0] "К сожалению, Вы не может удалить ваш в
msgstr[1] "К сожалению, Вы не может удалить ваш вопрос, поскольку на него ответили другие пользователи и их ответы получили положительные голоса"
msgstr[2] "К сожалению, Вы не может удалить ваш вопрос, поскольку на него ответили другие пользователи и их ответы получили положительные голоса"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "К сожалению, так как Ваша учетная запись заблокирована Вы не можете удалять сообщения"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "К сожалению, так как Ваша учетная запись приостановлена Вы не можете удалять сообщения"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "К сожалению, так как Ваша учетная запись заблокирована вы не можете закрыть вопросы"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "К сожалению, так как Ваша учетная запись приостановлена вы не можете закрыть вопросы"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "К сожалению, для закрытия сообщения других пользователей, требуется %(min_rep)s балов кармы"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "К сожалению, для закрытия своего вопроса, требуется %(min_rep)s балов кармы"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "К сожалению, только администраторы, модераторы или владельцы с кармой >%(min_rep)s может открыть вопрос"
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "К сожалению, чтобы вновь открыть собственный вопрос требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3747,67 +3729,67 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "К сожалению, только владельцы, администраторы сайта и модераторы могут менять теги к удаленным вопросам"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "К сожалению, так как Ваша учетная запись заблокирована вы не можете поменять теги вопроса "
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "К сожалению, так как Ваша учетная запись приостановлена вы можете менять теги только на свои вопросы"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "К сожалению, для изменения тегов требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "К сожалению, так как Ваша учетная запись заблокирована Вы не можете удалять комментарий"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "К сожалению, так как Ваша учетная запись приостановлена вы можете удалять только ваши собственные комментарии"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "К сожалению, для удаления комментариев требуется %(min_rep)s баллов кармы"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "%(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
@@ -3815,7 +3797,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
@@ -3823,7 +3805,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
@@ -3831,51 +3813,51 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "С уважением, Модератор форума"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Приостановленный пользователь "
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Заблокированный пользователь"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr ""
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "Видный пользователь"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Утвержденный Пользователь"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(reputation)s кармы %(username)s "
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
@@ -3883,7 +3865,7 @@ msgstr[0] "%(count)dзолотая медаль"
msgstr[1] "%(count)d золотых медалей"
msgstr[2] "%(count)d золотых медалей"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
@@ -3891,7 +3873,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
@@ -3899,17 +3881,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s и %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s имеет %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
@@ -3917,58 +3899,58 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "Поздравляем, вы получили '%(badge_name)s'. Проверьте свой профиль."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4238,49 +4220,57 @@ msgstr "Очень активны в одном теге"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Извините, вопрос удалён и более не доступен"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "К сожалению, ответ который вы ищете больше не доступен, потому что вопрос был удален"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "К сожалению, комментарии который вы ищете больше не доступны, потому что вопрос был удален"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "К сожалению, комментарий который Вы ищете больше не доступен, потому что ответ был удален"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4303,17 +4293,17 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4513,19 +4503,14 @@ msgstr "Измените одговор"
msgid "back"
msgstr "назад"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "ревизија"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Сачувајте промену"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4533,21 +4518,21 @@ msgstr "Сачувајте промену"
msgid "Cancel"
msgstr "Откажите"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr ""
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr ""
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4560,11 +4545,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4658,7 +4642,7 @@ msgstr "серебряная медаль: иногда присуждается
msgid "bronze badge: often given as a special honor"
msgstr "бронзовый значок: часто даётся как особая заслуга"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5143,61 +5127,61 @@ msgstr "текущее число голосов"
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "питано"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "опубликовал"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "пост отмечен как вики сообщества"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "Этот пост - вики. Любой с кармой >%(wiki_min_rep)s может улучшить его."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr ""
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5206,66 +5190,66 @@ msgstr ""
msgid "delete this comment"
msgstr "избриши овај коментар"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr ""
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s gravatar слика"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "претходна"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr ""
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "следећа странa"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
@@ -5273,21 +5257,21 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5296,23 +5280,23 @@ msgstr ""
msgid "Questions"
msgstr "Питања"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Одговорите на ваше питање"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5320,7 +5304,15 @@ msgstr ""
msgid "Edit question"
msgstr "Измени питање"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5404,66 +5396,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Корисници"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "нови"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "по корисничком имену"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Ништа није пронађено."
@@ -5484,97 +5476,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr ""
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "Email проверен"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5583,19 +5507,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5766,7 +5677,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr ""
@@ -5785,6 +5696,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Промени шифру"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6090,7 +6007,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6114,22 +6031,30 @@ msgstr[2] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6158,10 +6083,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6176,10 +6097,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6268,7 +6185,66 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Пожалуйста, исправьте ошибку, указанную ниже:"
+msgstr[1] "Пожалуйста, исправьте ошибки, указанные ниже:"
+msgstr[2] "Пожалуйста, исправьте ошибки, указанные ниже:"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "Настройки включены в %(name)s ."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "У вас нет разрешения на изменение значений."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Главная"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "Livesettings отключены для этого сайта."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Все параметры конфигурации должны быть изменены в файле settings.py "
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Развернуть все"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6357,7 +6333,7 @@ msgid "Did not find what you were looking for?"
msgstr "Не нашли то, что искали?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
+msgid "Ask your question!"
msgstr ""
#: templates/main_page/tab_bar.html:11
@@ -6406,7 +6382,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6771,7 +6747,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6906,6 +6882,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -7017,24 +7022,24 @@ msgstr "последњи пут виђен"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "локација"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "старост"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "данашњи неискоришћени гласови"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "преостало гласова"
@@ -7133,7 +7138,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
@@ -7141,13 +7146,13 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7253,7 +7258,7 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "комментарии и ответы на другие вопросы"
@@ -7269,7 +7274,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "голос пользователя"
@@ -7278,11 +7283,11 @@ msgstr "голос пользователя"
msgid "votes"
msgstr ""
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "настройки подписки по электронной почте"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7303,7 +7308,15 @@ msgstr ""
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7311,23 +7324,23 @@ msgstr ""
msgid "Contributors"
msgstr ""
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(обавезно)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Включить/выключить предварительный просмотр текста"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7601,23 +7614,23 @@ msgstr ""
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Извините, произошла ошибка!"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7681,31 +7694,31 @@ msgstr "ову е-пошту већ користи неки корисник, и
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "шифра је неопходна"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "молимo Вас, поново откуцајте шифру"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "унета шифра не одговара, покушајте поново"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "пре 2 дана"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "јуче"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
@@ -7713,7 +7726,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7773,46 +7786,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "частота обновлений по email была установлена в ежедневную"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7841,113 +7858,113 @@ msgstr "Мы с нетерпением ждем ваших отзывов!"
msgid "Privacy policy"
msgstr ""
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Извините, но запрашиваемый комментарий был удалён"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "кориснички профил"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "преглед корисниковог профила"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "недавне активности корисника"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "профил - недавне активности"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "профил - одговори"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "профил - гласови"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "омиљена питања корисника"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "профил - омиљена питања"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "промене су сачуване"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "обновления по email отменены"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "профил - претплата е-поштом"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "неавторизированные пользователи не могут загружать файлы"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "дозвољени типови датотека су '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7956,45 +7973,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "Извините, вы не вошли, поэтому не можете оставлять комментарии. Войдите."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "Извините, вы не вошли, поэтому не можете удалять комментарии. Войдите."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Извините, у нас определённые технические проблемы."
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/tr/LC_MESSAGES/django.po b/askbot/locale/tr/LC_MESSAGES/django.po
index 58563d12..5b3e1292 100644
--- a/askbot/locale/tr/LC_MESSAGES/django.po
+++ b/askbot/locale/tr/LC_MESSAGES/django.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Dikkat: bunu işaretledikten sonra, etiketi global olarak değiştirmek için; lütfen veritabanını yedekleyin, ve şu yönetim komutunu çalıştırın: python manage.py fix_question_tags
"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "etiket listesi biçimi"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Etiketlerin gösterileceği biçimi seçim, basit bir liste veya etiket bulutu şeklinde olabilir"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "Etiketler"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "Mesajların altına eklenecek varsayılan maks. yorumların sayısı"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "Yorumlar %(max_len)s karakteri aşmamalıdır."
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "Yorumları düzenleme süresini kısıtla"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "Eğer kaldırılırsa, yorumları düzenlemek için bir zaman sınırlaması olmayacaktır"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "Yorumu değiştirmek için izin verilen süre"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "Bu ayarı etkinleştirmek için, bir öncekini kontrol edin"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Maalesef, yetki kısıtlamaları nedeniyle sorunuz gönderilemedi
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "%(question_count)d adet sorunuzun en iyi cevabı onaylayın" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3455,11 +3438,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "yeni soru" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "
Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3482,86 +3465,86 @@ msgstr[1] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "Üzgünüz, hesabınız bloklandı, soruları onaylama/onayı kaldırma hakkınız yok"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "Üzgünüz, hesabınız askıya alındı, soruları onaylama/onayı kaldırma hakkınız yok"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "Üzgünüz, hesabınız bloklanmış"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "Üzgünüz, hesabınız askıya alınmış"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "beğeninizi göstermek için en az %(points)s puan toplamalısınız "
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "beğenmediğinizi göstermek için en az %(points)s puan toplamalısınız"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "Üzgünüz, bloklu kullanıclar dosya yükleyemez"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "Üzgünüz, hasabınız askıda olduğu için dosya yükleyemessiniz"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3572,57 +3555,57 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "Üzgünüz, yalnızca yazarlar ve moderatörler yorumları düzenleyebilir"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "Üzgünüz, hesabınız askıya alınmış, yalnızca kendi mesajlarınıza yorum yapabilirsiniz"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "Bu mesaj silinmiş, sadece yöneticiler ve mesajın yazarı tarafından görülebilir. "
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "Üzgünüz, sadece moderatörler, yöneticiler ve mesajın yazarı silinmiş bir mesajı düzenleyebilir."
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "Üzgünüz, hesabınız bloke edildigi müddetçe mesajlarınızı düzenleyemezsiniz."
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "Üzgünüz, hesabınız askıda olduğu müddetçe mesajlarınızı düzenleyemezsiniz."
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3632,103 +3615,103 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "Üzgünüz, hesabınız bloke edildigi müddetçe mesajlarınızı silemezsiniz"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "Üzgünüz, hesabınız askıda olduğu müddetçe sadece kendi mesajlarınızı silebilirsiniz."
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "Üzgünüz, hesabınız bloke edildigi müddetçe soruları kapatamazsınız"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "Üzgünüz, hesabınız askıda olduğu müddetçe soruları kapatamazsınız"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
@@ -3736,221 +3719,221 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "Üzgünüz, hesabınız bloklu olduğu müddetçe soruların etiketini değiştiremezsiniz"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "Üzgünüz, hesabınız askıda olduğu müddetçe sadece kendi sorularınızın etiketini değiştirebilirsiniz"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "Üzgünüz, hesabınız bloklu olduğu müddetçe yorum silemezsiniz"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "Üzgünüz, hesabınız bloklu olduğu müddetçe sadece kendi yorumlarınızı silebilirsiniz"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "Üzgünüz, yoruları silebilmeniz için en az %(min_rep)s puanınız olmalı"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "%(date)s tarihinde"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "2 gün içinde"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "yarın"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "Anonim"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "Site yöneticisi"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "Forum Moderatörü"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "Uzaklaştırılmış üye"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "Bloklanmış kullanıcı"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "Kayıtlı kullanıcı"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "İzlenen üye"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "Onaylı kullanıcı"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s adlı kullanıcının %(reputation)s karma puanı var"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "one: tek altın rozet\nother: %(count)d altın rozet"
msgstr[1] "one: tek altın rozet\nother: %(count)d altın rozet"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "one: tek gümüş rozet\nother: %(count)d gümüş rozet"
msgstr[1] "one: tek gümüş rozet\nother: %(count)d gümüş rozet"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "one: tek bronz rozet\nother: %(count)d bronz rozet"
msgstr[1] "one: tek bronz rozet\nother: %(count)d bronz rozet"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
msgstr[1] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "Tebrikler! Etiket aboneliğiniz kaydedildi."
@@ -4220,49 +4203,57 @@ msgstr "Bir etikette çok etkin"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "Üzgünüz, bu soru silinmiş"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "en az cevaplanan sorular"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "Üzgünüz, bu cevap silinmiş"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4284,17 +4275,17 @@ msgid_plural "%(count)d answers:"
msgstr[0] ""
msgstr[1] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4494,19 +4485,14 @@ msgstr "Cevapı düzenle"
msgid "back"
msgstr "geri"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "revizyon"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "Değişikliği kaydet"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4514,21 +4500,21 @@ msgstr "Değişikliği kaydet"
msgid "Cancel"
msgstr "Iptal"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "önizlemeyi gizle"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "önizlemeyi göster"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4541,11 +4527,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4638,7 +4623,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr "bronz madalya: genellikle özel bir onur olarak verilir"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5123,61 +5108,61 @@ msgstr "oy geçerli sayısı"
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "soruldu"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "cevaplandı"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "yollandı"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "güncellendi"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "'%(tag)s' etiketli sorulara bak"
@@ -5186,87 +5171,87 @@ msgstr "'%(tag)s' etiketli sorulara bak"
msgid "delete this comment"
msgstr "bu yorumu sil"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "değiştir"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s
Gravatar görüntüsü"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "önceki"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "şuanki sayfa"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "sonraki sayfa"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
msgstr[1] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "şu an yeni cevap yok"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5275,23 +5260,23 @@ msgstr ""
msgid "Questions"
msgstr "Sorular"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "Kendi soruna cevap yaz!"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5299,7 +5284,15 @@ msgstr ""
msgid "Edit question"
msgstr "Soruyu düzenle"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5383,66 +5376,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "Kullanıcılar"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "son"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "kullanıcı tarafından"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "Hiçbir şey bulunamadı."
@@ -5463,97 +5456,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "E-mail adresinizi kaydedin"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "E-mail adresini kaydet"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "E-mail adresini doğrula"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "E-mail değişmedi"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "E-mail değiştirildi"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "E-mail doğrulandı"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5562,19 +5487,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5745,7 +5657,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "Şifre"
@@ -5764,6 +5676,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "Şifre değiştir"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6069,7 +5987,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6092,22 +6010,30 @@ msgstr[1] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6136,10 +6062,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6154,10 +6076,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6246,7 +6164,65 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "Siteler"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "%(name)s içerisinde yer alan ayarlar."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "Değerleri değiştirmek için yetkin yok."
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "Belgelendirme"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "Güvenli Çıkış"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "Anasayfa"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "Site Ayarlarını Düzenle"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "\"Livesettings\" bu site için devre dışı bırakılmıştır."
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "Tüm yapılandırma seçenekleri settings.py dosyasında düzenlenmelidir"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "Grup ayarları: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "Hepsini kapat"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6334,8 +6310,8 @@ msgid "Did not find what you were looking for?"
msgstr "Aradığını bulamadın mı?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "Hemen kendi sorunu yolla!"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6381,7 +6357,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6744,7 +6720,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6879,6 +6855,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6990,24 +6995,24 @@ msgstr "son görülme"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "yer"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "yaş"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "bugün kullanılmayan oy"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "oy kullandı"
@@ -7105,20 +7110,20 @@ msgid_plural "Followed by %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
msgstr[1] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7218,7 +7223,7 @@ msgstr ""
msgid "User profile"
msgstr "Kullanıcı profili"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "diğer sorulara cevaplar ve yorumlar"
@@ -7234,7 +7239,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "kullanıcı oy rekoru"
@@ -7243,11 +7248,11 @@ msgstr "kullanıcı oy rekoru"
msgid "votes"
msgstr "oy"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "E-mail abonelik ayarları"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "kullanıcıyı yönet"
@@ -7268,7 +7273,15 @@ msgstr "tartışmaya girmek yerine, soruya bir cevap vermeye çalışın"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7276,23 +7289,23 @@ msgstr ""
msgid "Contributors"
msgstr "Yazarlar"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(gerekli)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "Toggle gerçek zamanlı Markdown editörü önizleme"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7563,23 +7576,23 @@ msgstr "Ayarlar"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "Ahh, özür dileriz - bir hata meydana geldi"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "Yazmak için lütfen giriş yapınız"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "İletinizde spam içerik tespit edildi, eğer bu bir hataysa özür dileriz"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7643,38 +7656,38 @@ msgstr "Bu E-mail sitemizde kullanılıyor. Şifre hatırlatmayı deneyebilir ya
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "şifre yazmalısınız."
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "lütfen şifrenizi yeniden yazın"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "Üzgünüm, şifreler uyuşmuyor lütfen tekrar deneyin."
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2 gün önce"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "dün"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "one: %(hr)d saat önce\nother: %(hr)d saat önce"
msgstr[1] "one: %(hr)d saat önce\nother: %(hr)d saat önce"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7733,46 +7746,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "E-mail güncelleme sıklığı günlük olarak belirtilmiştir."
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr "%(tags)s 'a abone olmak için giriş yapınız "
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "Lütfen oy vermek için giriş yapın:"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7801,113 +7818,113 @@ msgstr "Görüşlerinizi bekliyoruz! Lütfen bize, yakın bir zamanda mutlaka si
msgid "Privacy policy"
msgstr "Gizlilik politikası"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "Üzgünüz, aradığınız yorum silinmiş"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "kullanıcıyı yönet"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "kullanıcı profili"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "kullanıcı profiline genel bakış"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "son kullanıcı etkinliği"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "profil - son etkinlikler"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "profil - cevapları"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "profil - oy"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "kullanıcının favori soruları"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "profil - favori sorular"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "değişiklikler kaydedildi"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "E-mail güncellemeleri iptal edildi"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "profil - e-mail abonelikleri"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "Üzgünüz, yükleme yapmanız için üye olmanız gerekmektedir"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "izin verilen dosya türleri '%(file_types)s'"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "maks. dosya boyutu is %(file_size)sK"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "Yükleme hatası. Yöneticiye başvurunuz. Teşekkürler."
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7916,45 +7933,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "Soruları cevaplandırmak için giriş yapınız"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "Üzgünüz, yorumları düzenlemek için üye olmanız gerekmektedir"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "Özür dileriz, bazı teknik sorunlar yaşıyoruz"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/tr/LC_MESSAGES/djangojs.po b/askbot/locale/tr/LC_MESSAGES/djangojs.po
index 518982f1..899f945d 100644
--- a/askbot/locale/tr/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/tr/LC_MESSAGES/djangojs.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-#
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "Soru başlığını girin (En az 10 karakter)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
msgstr[1] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -497,202 +501,206 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "kapatmak için tıkla"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
msgstr[1] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -755,7 +763,7 @@ msgstr "yatay bar"
msgid "undo"
msgstr "geri"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "yeniden"
@@ -771,15 +779,15 @@ msgstr "web adresini girin:
http://www.cnprog.com/ \"başlık bağlant
msgid "upload file attachment"
msgstr "Yüklenecek dosyayı seçin"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/vi/LC_MESSAGES/django.po b/askbot/locale/vi/LC_MESSAGES/django.po
index d849184c..51b75e66 100644
--- a/askbot/locale/vi/LC_MESSAGES/django.po
+++ b/askbot/locale/vi/LC_MESSAGES/django.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Cong It python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr ""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3444,11 +3428,11 @@ msgid_plural "" " %(sitename)s:
" msgstr[0] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3470,86 +3454,86 @@ msgstr[0] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ""
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr ""
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3559,57 +3543,57 @@ msgid_plural ""
"minutes from posting"
msgstr[0] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3618,317 +3602,317 @@ msgid_plural ""
"by other users"
msgstr[0] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
"Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgstr[0] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr ""
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr ""
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr ""
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr ""
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4198,49 +4182,57 @@ msgstr ""
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4261,17 +4253,17 @@ msgid "%(count)d answer:"
msgid_plural "%(count)d answers:"
msgstr[0] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4471,19 +4463,14 @@ msgstr ""
msgid "back"
msgstr ""
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr ""
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr ""
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4491,21 +4478,21 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr ""
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr ""
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4518,11 +4505,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4614,7 +4600,7 @@ msgstr ""
msgid "bronze badge: often given as a special honor"
msgstr ""
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5099,61 +5085,61 @@ msgstr ""
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr ""
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr ""
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr ""
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr ""
@@ -5162,86 +5148,86 @@ msgstr ""
msgid "delete this comment"
msgstr ""
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr ""
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr ""
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr ""
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr ""
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr ""
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5250,23 +5236,23 @@ msgstr ""
msgid "Questions"
msgstr ""
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr ""
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5274,7 +5260,15 @@ msgstr ""
msgid "Edit question"
msgstr ""
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5358,66 +5352,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr ""
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr ""
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr ""
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr ""
@@ -5438,97 +5432,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr ""
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr ""
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5537,19 +5463,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5720,7 +5633,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr ""
@@ -5739,6 +5652,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr ""
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6044,7 +5963,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6066,22 +5985,30 @@ msgstr[0] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6110,10 +6037,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6128,10 +6051,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6220,7 +6139,64 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6307,7 +6283,7 @@ msgid "Did not find what you were looking for?"
msgstr ""
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
+msgid "Ask your question!"
msgstr ""
#: templates/main_page/tab_bar.html:11
@@ -6352,7 +6328,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6713,7 +6689,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6848,6 +6824,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6959,24 +6964,24 @@ msgstr ""
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr ""
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr ""
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr ""
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr ""
@@ -7073,19 +7078,19 @@ msgid "Followed by %(count)s person"
msgid_plural "Followed by %(count)s people"
msgstr[0] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7179,7 +7184,7 @@ msgstr ""
msgid "User profile"
msgstr ""
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr ""
@@ -7195,7 +7200,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr ""
@@ -7204,11 +7209,11 @@ msgstr ""
msgid "votes"
msgstr ""
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr ""
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7229,7 +7234,15 @@ msgstr ""
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7237,23 +7250,23 @@ msgstr ""
msgid "Contributors"
msgstr ""
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr ""
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr ""
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7521,23 +7534,23 @@ msgstr ""
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7601,37 +7614,37 @@ msgstr ""
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr ""
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr ""
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr ""
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr ""
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr ""
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7689,46 +7702,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr ""
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7757,113 +7774,113 @@ msgstr ""
msgid "Privacy policy"
msgstr ""
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr ""
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr ""
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr ""
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr ""
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr ""
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr ""
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr ""
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr ""
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr ""
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr ""
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr ""
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr ""
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7872,45 +7889,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/zh_CN/LC_MESSAGES/django.po b/askbot/locale/zh_CN/LC_MESSAGES/django.po
index 34f63c4f..06f22a2d 100644
--- a/askbot/locale/zh_CN/LC_MESSAGES/django.po
+++ b/askbot/locale/zh_CN/LC_MESSAGES/django.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the CNPROG package.
#
# Translators:
-# Evgeny Fadeev python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr "Attention: after checking this, please back up the database, and run a management command: python manage.py fix_question_tags
to globally rename the tags"
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr "标签列表格式"
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr "Select the format to show tags in, either as a simple list, or as a tag cloud"
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr "使用通配符标签"
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr "Wildcard tags can be used to follow or ignore many tags at once, a valid wildcard tag has a single wildcard at the very end"
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr "默认显示最大留言数"
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr "最大留言长度,必须小于%(max_len)s"
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr "限制编辑评论的时间"
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr "如果取消选中,将无编辑评论时间限制"
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr "允许编辑评论的分钟数"
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr "要启用本设置,请选中前一个设置"
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Sorry, your question could not be posted due to insufficient privileges of your user account
" -#: mail/lamson_handlers.py:158 +#: mail/lamson_handlers.py:160 msgid "" "You were replying to an email address unknown to the system or " "you were replying from a different address from the one where you" " received the notification." msgstr "" -#: mail/lamson_handlers.py:245 +#: mail/lamson_handlers.py:251 #, python-format msgid "Re: Welcome to %(site_name)s" msgstr "" -#: mail/lamson_handlers.py:252 +#: mail/lamson_handlers.py:258 msgid "Please reply to the welcome email without editing it" msgstr "" -#: mail/lamson_handlers.py:314 +#: mail/lamson_handlers.py:318 #, python-format msgid "Re: %s" msgstr "" -#: management/commands/send_accept_answer_reminders.py:60 +#: management/commands/send_accept_answer_reminders.py:61 #, python-format msgid "Accept the best answer for %(question_count)d of your questions" msgstr "接受您 %(question_count)d 个问题的最佳答案" -#: management/commands/send_accept_answer_reminders.py:65 +#: management/commands/send_accept_answer_reminders.py:66 msgid "Please accept the best answer for this question:" msgstr "请接受此问题的最佳答案:" -#: management/commands/send_accept_answer_reminders.py:67 +#: management/commands/send_accept_answer_reminders.py:68 msgid "Please accept the best answer for these questions:" msgstr "请接受这些问题的最佳答案:" -#: management/commands/send_email_alerts.py:414 +#: management/commands/send_email_alerts.py:413 #, python-format msgid "%(question_count)d updated question about %(topics)s" msgid_plural "%(question_count)d updated questions about %(topics)s" msgstr[0] "关于 %(topics)s问题有%(question_count)d 个更新" -#: management/commands/send_email_alerts.py:425 +#: management/commands/send_email_alerts.py:424 #, python-format msgid "" "Dear %(name)s,
The following question has been updated " @@ -3444,11 +3428,11 @@ msgid_plural "" " %(sitename)s:
" msgstr[0] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "提问" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3470,86 +3454,86 @@ msgstr[0] "关于 %(topics)s问题有%(question_count)d 个更新"
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr "对不起,你不能认定或否决最佳答案因为你的账户已冻结"
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr "对不起,你不能认定或否决最佳答案因为你的账户已暂停使用"
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr "Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr "对不起,只有问题的提问者 - %(username)s - 可以认定最佳答案"
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr "对不起你的账户已冻结"
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr "对不起你的账户已暂停使用"
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr "需要+%(points)s积分才能投支持票。"
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "需要+%(points)s积分才能投反对票。"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr "对不起,冻结用户不能上传文件"
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr "对不起,暂停使用用户不能上传文件"
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3559,57 +3543,57 @@ msgid_plural ""
"minutes from posting"
msgstr[0] "对不起,留言只能在发布后%(minutes)s分钟内可编辑"
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr "对不起,只有发布者或版主才能修改留言"
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr "对不起,因为你的账户已暂停使用,你只能留言你自己发布的信息"
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr "对不起,留言任何信息都需要最少%(min_rep)s积分值,你可以留言你自己发布或回答的问题"
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr "这个问题已经被删除,而且只能被发布者,网站管理员和版主查看"
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr "对不起,只有版主,网站管理员及发布者可以编辑删除此信息"
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr "对不起,你不能编辑信息因为你的账户被冻结"
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr "对不起,你只能编辑你自己发布的信息因为你的账户被暂停使用"
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr "对不起,编辑wiki信息需要最低积分%(min_rep)s"
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "对不起,编辑其他人的信息需要最低积分%(min_rep)s"
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3618,317 +3602,317 @@ msgid_plural ""
"by other users"
msgstr[0] "对不起,你不能删除问题因为它已经有了投赞成票的答案"
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr "对不起,你不能删除发布的信息,因为你的账户被冻结了"
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr "对不起,你只能删除你自己发布的信息因为你的账户被暂停使用了"
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr "对不起,因为你的账户已冻结你不能关闭问题"
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr "对不起,因为你的账户已暂停使用你不能关闭问题"
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr "对不起,你必须有%(min_rep)s积分才能关闭别人发布的信息"
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr "对不起,你必须有%(min_rep)s积分才能关闭自己发布的问题"
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr "对不起,只有管理员,版主和有%(min_rep)s积分的发布者才能重开问题"
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr "对不起,你必须有%(min_rep)s积分才能重开自己发布的问题"
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr "无法移除不存在的标记"
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
"Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgstr[0] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr "您无权移除所有标记"
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr "本条目无标记"
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr "对不起,只有发问者,网站管理员和版主才能为已删除问题修改标签"
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr "对不起,你的账户已冻结,你不能为问题修改标签"
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr "对不起,你的账户已暂停使用,你只能为你自己的问题修改标签"
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr "对不起,为问题修改标签必须有%(min_rep)s积分值"
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr "对不起,因为你的账户已冻结你不能删除留言"
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr "对不起,因为你的账户暂停使用,你只能删除你自己的留言"
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr "对不起,删除留言必须有%(min_rep)s积分值"
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr "在%(date)s"
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr "两天内"
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr "明天"
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] "%(hr)d小时前"
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] "%(min)d分钟前"
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] "%(days)d 天"
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr "新用户需等待 %(days)s 天方可回答自己的提问。还剩 %(left)s"
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr "匿名"
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr "网站管理员"
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr "论坛版主"
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr "暂停账户"
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr "冻结账户"
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr "注册用户"
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr "浏览用户"
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr "认证用户"
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr "%(username)s 积分是 %(reputation)s"
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] "%(count)d 金牌"
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] "%(count)d 银牌"
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] "%(count)d 铜牌"
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr "%(item1)s 和 %(item2)s"
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr "%(user)s 有 %(badges)s"
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr "Re: \"%(title)s\""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr "恭喜,你获得一块'%(badge_name)s'徽章,查看你的资料."
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr "您的标签订阅已保存,非常感谢!"
@@ -4198,49 +4182,57 @@ msgstr "非常活跃的标签"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr "对不起,此问题已删除"
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr "对不起,你查找的问题已失效,因为问题已删除"
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr "对不起,这个问题已删除"
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr "对不起,你查找的评论不能访问,因为问题已删除"
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr "对不起,你查找的评论不能访问,因为回答已删除"
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4261,17 +4253,17 @@ msgid "%(count)d answer:"
msgid_plural "%(count)d answers:"
msgstr[0] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4471,19 +4463,14 @@ msgstr "修改回答"
msgid "back"
msgstr "返回"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "版本"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "现在修改"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4491,21 +4478,21 @@ msgstr "现在修改"
msgid "Cancel"
msgstr "取消"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "禁用预览"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "启用预览"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4518,11 +4505,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4614,7 +4600,7 @@ msgstr "银牌:偶尔颁发之优质奖章"
msgid "bronze badge: often given as a special honor"
msgstr "铜牌:时常授予之特殊荣誉"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5099,61 +5085,61 @@ msgstr "当前总票数"
msgid "anonymous user"
msgstr "匿名用户"
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "提问于"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr "回答"
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr "发布"
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr "这个发布像社区wiki被标记"
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr "这个发布是wiki.\n任何积分为 >%(wiki_min_rep)s 都可以改进它."
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "更新于"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "查看有关%(tag)s的问题"
@@ -5162,86 +5148,86 @@ msgstr "查看有关%(tag)s的问题"
msgid "delete this comment"
msgstr "删除这个留言"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "编辑"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr "关注 %(alias)s"
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr "取消关注 %(alias)s"
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr "已关注 %(alias)s"
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s 图像"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "上一页"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "当前页"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "下一页"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr "回应%(username)s"
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr "仍没有回应"
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr "%(new)s 新标记的发布和之前查看的 %(seen)s"
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr "%(new)s 新标记的发布信息"
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr "\"%(seen)s 已标记的发布信息"
@@ -5250,23 +5236,23 @@ msgstr "\"%(seen)s 已标记的发布信息"
msgid "Questions"
msgstr "问题列表"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "回答你自己的问题"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5274,7 +5260,15 @@ msgstr ""
msgid "Edit question"
msgstr "修改问题"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5358,66 +5352,66 @@ msgstr "订阅"
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "用户列表"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr "排序方式 »"
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr "查看积分最高的用户"
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr "积分"
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr "查看最新加入的用户"
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr ""
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr "查看最早加入的用户"
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr "按名字排序查看用户"
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "按用户名"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "没有找到相关数据。"
@@ -5438,97 +5432,29 @@ msgid "Sign in"
msgstr "注册帐号"
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "保存您的电子邮件地址"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr "保存邮件地址"
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr "更换电子邮件"
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "邮件地址未修改"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr "邮件地址已改"
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "邮件地址确认"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5537,19 +5463,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr "注册"
@@ -5720,7 +5633,7 @@ msgid "Login or email"
msgstr "登录名或电子邮箱地址"
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "密码"
@@ -5739,6 +5652,12 @@ msgstr "新密码"
msgid "Please, retype"
msgstr "确认密码"
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "修改密码"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6044,7 +5963,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6066,22 +5985,30 @@ msgstr[0] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6110,10 +6037,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6128,10 +6051,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6220,7 +6139,64 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr "网站"
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "请改正下面的错误"
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr "设置包含在%(name)s."
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr "你没有权限修改这些值"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr "文档"
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr "退出登录"
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr "首页"
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr "编辑网站设置"
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr "此功能不支持"
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr "所有配置选项都必须在网站的settings.py文件中设置"
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr "组别设置: %(name)s"
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr "全部收起"
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6307,8 +6283,8 @@ msgid "Did not find what you were looking for?"
msgstr "你找的问题没有?"
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "现在提问"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6352,7 +6328,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr "最多%(tag_count)s个标签,每个标签长度小于%(max_chars)s个字符。"
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6713,7 +6689,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6848,6 +6824,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6959,24 +6964,24 @@ msgstr "上次活动时间"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "城市"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "年龄"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "今日剩余投票数"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "剩余投票数"
@@ -7073,19 +7078,19 @@ msgid "Followed by %(count)s person"
msgid_plural "Followed by %(count)s people"
msgstr[0] "被 %(count)s 名用户"
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] "关注 %(count)s 名用户"
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr "网络为空。是否希望关注一些用户? - 只需访问其个人档案并点击“关注”"
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr "%(username)s用户概览"
@@ -7179,7 +7184,7 @@ msgstr "回答:"
msgid "User profile"
msgstr "用户概览"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "其他问题的回复和评论"
@@ -7195,7 +7200,7 @@ msgstr ""
msgid "questions that user is following"
msgstr "用户关注的问题"
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "用户所有投票"
@@ -7204,11 +7209,11 @@ msgstr "用户所有投票"
msgid "votes"
msgstr "票"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "邮件订阅设置"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr "设为版主"
@@ -7229,7 +7234,15 @@ msgstr "建议您提的问题是可以被答复的,而不仅仅是可以讨论
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7237,23 +7250,23 @@ msgstr ""
msgid "Contributors"
msgstr "贡献者"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "必填"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "打开或者关闭Markdown编辑器的实时预览"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7521,23 +7534,23 @@ msgstr "设置"
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr "对不起,系统错误"
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr "请登录后发帖"
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr "您的帖子中侦测到垃圾内容,如果是误报,我们非常抱歉"
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7601,37 +7614,37 @@ msgstr "该电子邮件已被注册,请选择另一个再试。"
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr "必填项"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr "确认密码"
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "对不起,你输入的密码不匹配,请重新输入"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr "2天前"
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "昨天"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] "%(hr)d小时前"
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7689,46 +7702,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "邮件更新频率已设置成每日更新"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr "标签订阅已取消 (撤销)。"
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr "请登录后投票"
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7757,113 +7774,113 @@ msgstr "我们期望你的反馈"
msgid "Privacy policy"
msgstr "隐私政策"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr "对不起,你找的这个评论已经被删除"
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr "管理用户"
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "用户概览"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "用户概览"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "最近活动"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "最近活动"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "回应 - 用户资料"
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "用户资料 - 投票"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "用户收藏的问题"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "收藏 - 用户资料"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "修改已保存"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "邮件更新取消"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr "邮件订阅"
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr "匿名用户不能上传文件"
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "只允许上传'%(file_types)s'类型的文件!"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr "只允许上传不超过%(file_size)sK大小的文件!"
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr "在文件上传过程中产生了错误,请联系管理员,谢谢^_^"
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7872,45 +7889,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr "请登录后回答"
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr "对不起,你已经退出,不恩那个在发表评论,请登录."
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr "匿名用户不能编辑评论"
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr "对不起,你已经退出,不恩那个在发表评论,请登录."
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr "对不起,好像有一些技术上的错误。"
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po b/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po
index 30cb1b97..e5c1a275 100644
--- a/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/zh_CN/LC_MESSAGES/djangojs.po
@@ -7,10 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr "请输入提问标题 (>10 字符)"
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -484,201 +488,205 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "点击消息框关闭"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -740,7 +748,7 @@ msgstr "水平线"
msgid "undo"
msgstr "撤销"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "重做"
@@ -756,15 +764,15 @@ msgstr "输入Web地址
示例:
http://www.cnprog.com/ \"
msgid "upload file attachment"
msgstr "上传文件附件"
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
diff --git a/askbot/locale/zh_TW/LC_MESSAGES/django.po b/askbot/locale/zh_TW/LC_MESSAGES/django.po
index 4cf6b35e..4e45baa1 100644
--- a/askbot/locale/zh_TW/LC_MESSAGES/django.po
+++ b/askbot/locale/zh_TW/LC_MESSAGES/django.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:41-0500\n"
-"PO-Revision-Date: 2013-05-06 13:51+0000\n"
-"Last-Translator: whisky python manage.py fix_question_tags
to "
"globally rename the tags"
msgstr ""
-#: conf/forum_data_rules.py:247
+#: conf/forum_data_rules.py:287
msgid "Format of tag list"
msgstr ""
-#: conf/forum_data_rules.py:249
+#: conf/forum_data_rules.py:289
msgid ""
"Select the format to show tags in, either as a simple list, or as a tag "
"cloud"
msgstr ""
-#: conf/forum_data_rules.py:261
+#: conf/forum_data_rules.py:301
msgid "Use wildcard tags"
msgstr ""
-#: conf/forum_data_rules.py:263
+#: conf/forum_data_rules.py:303
msgid ""
"Wildcard tags can be used to follow or ignore many tags at once, a valid "
"wildcard tag has a single wildcard at the very end"
msgstr ""
-#: conf/forum_data_rules.py:275
+#: conf/forum_data_rules.py:315
msgid "Use separate set for subscribed tags"
msgstr ""
-#: conf/forum_data_rules.py:277
+#: conf/forum_data_rules.py:317
msgid ""
"If enabled, users will have a third set of tag selections - \"subscribed\" "
"(by email) in additon to \"interesting\" and \"ignored\""
msgstr ""
-#: conf/forum_data_rules.py:285
+#: conf/forum_data_rules.py:325
msgid "Always, for all users"
msgstr ""
-#: conf/forum_data_rules.py:286
+#: conf/forum_data_rules.py:326
msgid "Never, for all users"
msgstr ""
-#: conf/forum_data_rules.py:287
+#: conf/forum_data_rules.py:327
msgid "Let users decide"
msgstr ""
-#: conf/forum_data_rules.py:295
+#: conf/forum_data_rules.py:335
msgid "Publicly show user tag selections"
msgstr ""
-#: conf/forum_data_rules.py:304
+#: conf/forum_data_rules.py:344
msgid "Enable separate tag search box on main page"
msgstr ""
-#: conf/forum_data_rules.py:314
+#: conf/forum_data_rules.py:354
msgid "Default max number of comments to display under posts"
msgstr ""
-#: conf/forum_data_rules.py:325
+#: conf/forum_data_rules.py:365
#, python-format
msgid "Maximum comment length, must be < %(max_len)s"
msgstr ""
-#: conf/forum_data_rules.py:335
+#: conf/forum_data_rules.py:375
msgid "Limit time to edit comments"
msgstr ""
-#: conf/forum_data_rules.py:337
+#: conf/forum_data_rules.py:377
msgid "If unchecked, there will be no time limit to edit the comments"
msgstr ""
-#: conf/forum_data_rules.py:348
+#: conf/forum_data_rules.py:388
msgid "Minutes allowed to edit a comment"
msgstr ""
-#: conf/forum_data_rules.py:349
+#: conf/forum_data_rules.py:389
msgid "To enable this setting, check the previous one"
msgstr ""
-#: conf/forum_data_rules.py:358
+#: conf/forum_data_rules.py:398
msgid "Save comment by pressing
Dear %(name)s,
The following question has been updated " @@ -3445,11 +3429,11 @@ msgid_plural "" " %(sitename)s:
" msgstr[0] "" -#: management/commands/send_email_alerts.py:449 +#: management/commands/send_email_alerts.py:448 msgid "new question" msgstr "提問" -#: management/commands/send_email_alerts.py:474 +#: management/commands/send_email_alerts.py:473 #, python-format msgid "" "Please remember that you can always "
msgstr ""
-#: management/commands/send_unanswered_question_reminders.py:66
+#: management/commands/send_unanswered_question_reminders.py:67
#, python-format
msgid "%(question_count)d unanswered question about %(topics)s"
msgid_plural "%(question_count)d unanswered questions about %(topics)s"
@@ -3471,86 +3455,86 @@ msgstr[0] ""
msgid "Please log in to use %s"
msgstr ""
-#: models/__init__.py:518
+#: models/__init__.py:561
msgid "Sorry, this operation is not allowed"
msgstr ""
-#: models/__init__.py:568
+#: models/__init__.py:611
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"blocked"
msgstr ""
-#: models/__init__.py:572
+#: models/__init__.py:615
msgid ""
"Sorry, you cannot accept or unaccept best answers because your account is "
"suspended"
msgstr ""
-#: models/__init__.py:586
+#: models/__init__.py:629
#, python-format
msgid ""
">%(points)s points required to accept or unaccept your own answer to your "
"own question"
msgstr ""
-#: models/__init__.py:610
+#: models/__init__.py:653
#, python-format
msgid ""
"Sorry, you will be able to accept this answer only after %(will_be_able_at)s"
msgstr ""
-#: models/__init__.py:619
+#: models/__init__.py:662
#, python-format
msgid ""
"Sorry, only moderators or original author of the question - %(username)s - "
"can accept or unaccept the best answer"
msgstr ""
-#: models/__init__.py:642
+#: models/__init__.py:685
msgid "Sorry, you cannot vote for your own posts"
msgstr ""
-#: models/__init__.py:646
+#: models/__init__.py:689
msgid "Sorry your account appears to be blocked "
msgstr ""
-#: models/__init__.py:651
+#: models/__init__.py:694
msgid "Sorry your account appears to be suspended "
msgstr ""
-#: models/__init__.py:661
+#: models/__init__.py:704
#, python-format
msgid ">%(points)s points required to upvote"
msgstr ""
-#: models/__init__.py:667
+#: models/__init__.py:710
#, python-format
msgid ">%(points)s points required to downvote"
msgstr "需要+%(points)s積分才能投反對票。"
-#: models/__init__.py:682
+#: models/__init__.py:725
msgid "Sorry, blocked users cannot upload files"
msgstr ""
-#: models/__init__.py:683
+#: models/__init__.py:726
msgid "Sorry, suspended users cannot upload files"
msgstr ""
-#: models/__init__.py:685
+#: models/__init__.py:728
#, python-format
msgid "sorry, file uploading requires karma >%(min_rep)s"
msgstr ""
-#: models/__init__.py:704
+#: models/__init__.py:747
msgid "Could not post, because your karma is insufficient to publish links"
msgstr ""
-#: models/__init__.py:730
+#: models/__init__.py:773
msgid "Sorry, you already gave an answer, please edit it instead."
msgstr ""
-#: models/__init__.py:754
+#: models/__init__.py:797
#, python-format
msgid ""
"Sorry, comments (except the last one) are editable only within %(minutes)s "
@@ -3560,57 +3544,57 @@ msgid_plural ""
"minutes from posting"
msgstr[0] ""
-#: models/__init__.py:766
+#: models/__init__.py:809
msgid "Sorry, but only post owners or moderators can edit comments"
msgstr ""
-#: models/__init__.py:795
+#: models/__init__.py:838
msgid ""
"Sorry, since your account is suspended you can comment only your own posts"
msgstr ""
-#: models/__init__.py:799
+#: models/__init__.py:842
#, python-format
msgid ""
"Sorry, to comment any post a minimum reputation of %(min_rep)s points is "
"required. You can still comment your own posts and answers to your questions"
msgstr ""
-#: models/__init__.py:829
+#: models/__init__.py:872
msgid ""
"This post has been deleted and can be seen only by post owners, site "
"administrators and moderators"
msgstr ""
-#: models/__init__.py:846
+#: models/__init__.py:889
msgid ""
"Sorry, only moderators, site administrators and post owners can edit deleted"
" posts"
msgstr ""
-#: models/__init__.py:861
+#: models/__init__.py:904
msgid "Sorry, since your account is blocked you cannot edit posts"
msgstr ""
-#: models/__init__.py:865
+#: models/__init__.py:908
msgid ""
"Sorry, since your account is suspended you can edit only your own posts"
msgstr ""
-#: models/__init__.py:870
+#: models/__init__.py:913
#, python-format
msgid ""
"Sorry, to edit wiki posts, a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:877
+#: models/__init__.py:920
#, python-format
msgid ""
"Sorry, to edit other people's posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:940
+#: models/__init__.py:983
msgid ""
"Sorry, cannot delete your question since it has an upvoted answer posted by "
"someone else"
@@ -3619,317 +3603,317 @@ msgid_plural ""
"by other users"
msgstr[0] ""
-#: models/__init__.py:955
+#: models/__init__.py:998
msgid "Sorry, since your account is blocked you cannot delete posts"
msgstr ""
-#: models/__init__.py:959
+#: models/__init__.py:1002
msgid ""
"Sorry, since your account is suspended you can delete only your own posts"
msgstr ""
-#: models/__init__.py:963
+#: models/__init__.py:1006
#, python-format
msgid ""
"Sorry, to delete other people's posts, a minimum reputation of %(min_rep)s "
"is required"
msgstr ""
-#: models/__init__.py:983
+#: models/__init__.py:1026
msgid "Sorry, since your account is blocked you cannot close questions"
msgstr ""
-#: models/__init__.py:987
+#: models/__init__.py:1030
msgid "Sorry, since your account is suspended you cannot close questions"
msgstr ""
-#: models/__init__.py:991
+#: models/__init__.py:1034
#, python-format
msgid ""
"Sorry, to close other people' posts, a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1000
+#: models/__init__.py:1043
#, python-format
msgid ""
"Sorry, to close own question a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1026
+#: models/__init__.py:1069
#, python-format
msgid ""
"Sorry, only administrators, moderators or post owners with reputation > "
"%(min_rep)s can reopen questions."
msgstr ""
-#: models/__init__.py:1032
+#: models/__init__.py:1075
#, python-format
msgid ""
"Sorry, to reopen own question a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1037
+#: models/__init__.py:1080
msgid "Sorry, you cannot reopen questions because your account is blocked"
msgstr ""
-#: models/__init__.py:1042
+#: models/__init__.py:1085
msgid "Sorry, you cannot reopen questions because your account is suspended"
msgstr ""
-#: models/__init__.py:1065
+#: models/__init__.py:1108
msgid "You have flagged this question before and cannot do it more than once"
msgstr ""
-#: models/__init__.py:1073
+#: models/__init__.py:1116
msgid ""
"Sorry, since your account is blocked you cannot flag posts as offensive"
msgstr ""
-#: models/__init__.py:1084
+#: models/__init__.py:1127
#, python-format
msgid ""
"Sorry, to flag posts as offensive a minimum reputation of %(min_rep)s is "
"required"
msgstr ""
-#: models/__init__.py:1105
+#: models/__init__.py:1148
#, python-format
msgid ""
"Sorry, you have exhausted the maximum number of %(max_flags_per_day)s "
"offensive flags per day."
msgstr ""
-#: models/__init__.py:1117
+#: models/__init__.py:1160
msgid "cannot remove non-existing flag"
msgstr ""
-#: models/__init__.py:1123
+#: models/__init__.py:1166
msgid "Sorry, since your account is blocked you cannot remove flags"
msgstr ""
-#: models/__init__.py:1127
+#: models/__init__.py:1170
msgid ""
"Sorry, your account appears to be suspended and you cannot remove flags. "
"Please contact the forum administrator to reach a resolution."
msgstr ""
-#: models/__init__.py:1133
+#: models/__init__.py:1176
#, python-format
msgid "Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgid_plural ""
"Sorry, to flag posts a minimum reputation of %(min_rep)d is required"
msgstr[0] ""
-#: models/__init__.py:1152
+#: models/__init__.py:1195
msgid "you don't have the permission to remove all flags"
msgstr ""
-#: models/__init__.py:1153
+#: models/__init__.py:1196
msgid "no flags for this entry"
msgstr ""
-#: models/__init__.py:1177
+#: models/__init__.py:1220
msgid ""
"Sorry, only question owners, site administrators and moderators can retag "
"deleted questions"
msgstr ""
-#: models/__init__.py:1184
+#: models/__init__.py:1227
msgid "Sorry, since your account is blocked you cannot retag questions"
msgstr ""
-#: models/__init__.py:1188
+#: models/__init__.py:1231
msgid ""
"Sorry, since your account is suspended you can retag only your own questions"
msgstr ""
-#: models/__init__.py:1192
+#: models/__init__.py:1235
#, python-format
msgid ""
"Sorry, to retag questions a minimum reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1211
+#: models/__init__.py:1254
msgid "Sorry, since your account is blocked you cannot delete comment"
msgstr ""
-#: models/__init__.py:1215
+#: models/__init__.py:1258
msgid ""
"Sorry, since your account is suspended you can delete only your own comments"
msgstr ""
-#: models/__init__.py:1219
+#: models/__init__.py:1262
#, python-format
msgid "Sorry, to delete comments reputation of %(min_rep)s is required"
msgstr ""
-#: models/__init__.py:1243
+#: models/__init__.py:1286
msgid "sorry, but older votes cannot be revoked"
msgstr ""
-#: models/__init__.py:1926 utils/functions.py:97
+#: models/__init__.py:1973 utils/functions.py:98
#, python-format
msgid "on %(date)s"
msgstr ""
-#: models/__init__.py:1928
+#: models/__init__.py:1975
msgid "in two days"
msgstr ""
-#: models/__init__.py:1930
+#: models/__init__.py:1977
msgid "tomorrow"
msgstr ""
-#: models/__init__.py:1932
+#: models/__init__.py:1979
#, python-format
msgid "in %(hr)d hour"
msgid_plural "in %(hr)d hours"
msgstr[0] ""
-#: models/__init__.py:1934
+#: models/__init__.py:1981
#, python-format
msgid "in %(min)d min"
msgid_plural "in %(min)d mins"
msgstr[0] ""
-#: models/__init__.py:1935
+#: models/__init__.py:1982
#, python-format
msgid "%(days)d day"
msgid_plural "%(days)d days"
msgstr[0] ""
-#: models/__init__.py:1937
+#: models/__init__.py:1984
#, python-format
msgid ""
"New users must wait %(days)s before answering their own question. You can "
"post an answer %(left)s"
msgstr ""
-#: models/__init__.py:2125 templates/email/feedback_email.txt:9
+#: models/__init__.py:2172 templates/email/feedback_email.txt:9
msgid "Anonymous"
msgstr ""
-#: models/__init__.py:2229
+#: models/__init__.py:2276
msgid "Site Adminstrator"
msgstr ""
-#: models/__init__.py:2231
+#: models/__init__.py:2278
msgid "Forum Moderator"
msgstr ""
-#: models/__init__.py:2233
+#: models/__init__.py:2280
msgid "Suspended User"
msgstr ""
-#: models/__init__.py:2235
+#: models/__init__.py:2282
msgid "Blocked User"
msgstr ""
-#: models/__init__.py:2237
+#: models/__init__.py:2284
msgid "Registered User"
msgstr ""
-#: models/__init__.py:2239
+#: models/__init__.py:2286
msgid "Watched User"
msgstr ""
-#: models/__init__.py:2241
+#: models/__init__.py:2288
msgid "Approved User"
msgstr ""
-#: models/__init__.py:2423
+#: models/__init__.py:2473
#, python-format
msgid "%(username)s karma is %(reputation)s"
msgstr ""
-#: models/__init__.py:2433
+#: models/__init__.py:2486
#, python-format
msgid "one gold badge"
msgid_plural "%(count)d gold badges"
msgstr[0] ""
-#: models/__init__.py:2440
+#: models/__init__.py:2493
#, python-format
msgid "one silver badge"
msgid_plural "%(count)d silver badges"
msgstr[0] ""
-#: models/__init__.py:2447
+#: models/__init__.py:2500
#, python-format
msgid "one bronze badge"
msgid_plural "%(count)d bronze badges"
msgstr[0] ""
-#: models/__init__.py:2458
+#: models/__init__.py:2511
#, python-format
msgid "%(item1)s and %(item2)s"
msgstr ""
-#: models/__init__.py:2462
+#: models/__init__.py:2513
#, python-format
msgid "%(user)s has %(badges)s"
msgstr ""
-#: models/__init__.py:2595
+#: models/__init__.py:2646
#, python-format
msgid "At least %d karma point is required to post links"
msgid_plural "At least %d karma points is required to post links"
msgstr[0] ""
-#: models/__init__.py:3074
+#: models/__init__.py:3118
#, python-format
msgid "%(user)s shared a %(post_link)s."
msgstr ""
-#: models/__init__.py:3077 models/__init__.py:3087
+#: models/__init__.py:3121 models/__init__.py:3131
#, python-format
msgid "%(user)s edited a %(post_link)s."
msgstr ""
-#: models/__init__.py:3079
+#: models/__init__.py:3123
#, python-format
msgid "%(user)s posted a %(post_link)s"
msgstr ""
-#: models/__init__.py:3082
+#: models/__init__.py:3126
#, python-format
msgid "%(user)s edited an %(post_link)s."
msgstr ""
-#: models/__init__.py:3084
+#: models/__init__.py:3128
#, python-format
msgid "%(user)s posted an %(post_link)s."
msgstr ""
-#: models/__init__.py:3089
+#: models/__init__.py:3133
#, python-format
msgid "%(user)s posted a %(post_link)s."
msgstr ""
-#: models/__init__.py:3106
+#: models/__init__.py:3149
msgid "To reply, PLEASE WRITE ABOVE THIS LINE."
msgstr ""
-#: models/__init__.py:3138
+#: models/__init__.py:3188
#, python-format
msgid "\"%(title)s\""
msgstr ""
-#: models/__init__.py:3290
+#: models/__init__.py:3340
#, python-format
msgid ""
"Congratulations, you have received a badge '%(badge_name)s'. Check out your profile."
msgstr ""
-#: models/__init__.py:3560
+#: models/__init__.py:3613
#, python-format
msgid "Welcome to %(site_name)s"
msgstr ""
-#: models/__init__.py:3581 views/commands.py:689
+#: models/__init__.py:3634 views/commands.py:697
msgid "Your tag subscription was saved, thanks!"
msgstr ""
@@ -4199,49 +4183,57 @@ msgstr "某一標籤常啟用"
msgid "message"
msgstr ""
-#: models/post.py:1551
+#: models/post.py:414
+msgid "Question: "
+msgstr ""
+
+#: models/post.py:416
+msgid "Answer: "
+msgstr ""
+
+#: models/post.py:1569
msgid "Sorry, this question has been deleted and is no longer accessible"
msgstr ""
-#: models/post.py:1567
+#: models/post.py:1585
msgid ""
"Sorry, the answer you are looking for is no longer available, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1574
+#: models/post.py:1592
msgid "Sorry, this answer has been removed and is no longer accessible"
msgstr ""
-#: models/post.py:1590
+#: models/post.py:1608
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent question has been removed"
msgstr ""
-#: models/post.py:1597
+#: models/post.py:1615
msgid ""
"Sorry, the comment you are looking for is no longer accessible, because the "
"parent answer has been removed"
msgstr ""
-#: models/post.py:1619
+#: models/post.py:1637
msgid "This post is temporarily not available"
msgstr ""
-#: models/post.py:2128
+#: models/post.py:2146
#, python-format
msgid ""
"Thank you for your post to %(site)s. It will be published after the "
"moderators review."
msgstr ""
-#: models/post.py:2132
+#: models/post.py:2150
#, python-format
msgid "your post to %(site)s"
msgstr ""
-#: models/post.py:2139
+#: models/post.py:2157
msgid ""
"Your post was placed on the moderation queue and will be published after the"
" moderator approval."
@@ -4262,17 +4254,17 @@ msgid "%(count)d answer:"
msgid_plural "%(count)d answers:"
msgstr[0] ""
-#: models/question.py:1263
+#: models/question.py:1267
#, python-format
msgid "Tag %s is new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1268 models/tag.py:217
+#: models/question.py:1272 models/tag.py:217
#, python-format
msgid "Tags %s are new and will be submitted for the moderators approval"
msgstr ""
-#: models/question.py:1503
+#: models/question.py:1507
#, python-format
msgid "Please, review your question."
msgstr ""
@@ -4472,19 +4464,14 @@ msgstr "修改回答"
msgid "back"
msgstr "返回"
-#: templates/answer_edit.html:14
-msgid "revision"
-msgstr "版本"
-
-#: templates/answer_edit.html:46 templates/question_edit.html:57
+#: templates/answer_edit.html:41 templates/question_edit.html:61
msgid "Save edit"
msgstr "儲存修改"
-#: templates/answer_edit.html:51 templates/close.html:16
-#: templates/feedback.html:64 templates/question_edit.html:58
+#: templates/answer_edit.html:46 templates/close.html:16
+#: templates/feedback.html:64 templates/question_edit.html:62
#: templates/question_retag.html:22 templates/reopen.html:28
#: templates/subscribe_for_tags.html:16
-#: templates/authopenid/changeemail.html:51
#: templates/user_profile/reject_post_dialog.html:36
#: templates/user_profile/reject_post_dialog.html:74
#: templates/user_profile/reject_post_dialog.html:104
@@ -4492,21 +4479,21 @@ msgstr "儲存修改"
msgid "Cancel"
msgstr "取消"
-#: templates/answer_edit.html:92 templates/answer_edit.html.py:95
-#: templates/ask.html:74 templates/ask.html.py:77
-#: templates/question_edit.html:97 templates/question_edit.html.py:100
+#: templates/answer_edit.html:87 templates/answer_edit.html.py:90
+#: templates/ask.html:82 templates/ask.html.py:85
+#: templates/question_edit.html:101 templates/question_edit.html.py:104
#: templates/question/javascript.html:73 templates/question/javascript.html:76
-#: templates/widgets/edit_post.html:83
+#: templates/widgets/edit_post.html:73
msgid "hide preview"
msgstr "禁用預覽"
-#: templates/answer_edit.html:95 templates/ask.html:77
-#: templates/question_edit.html:100 templates/question/javascript.html:76
+#: templates/answer_edit.html:90 templates/ask.html:85
+#: templates/question_edit.html:104 templates/question/javascript.html:76
msgid "show preview"
msgstr "顯示預覽"
#: templates/ask.html:4 templates/widgets/ask_button.html:9
-#: templates/widgets/ask_form.html:48
+#: templates/widgets/ask_form.html:66
msgid "Ask Your Question"
msgstr ""
@@ -4519,11 +4506,10 @@ msgstr ""
#: templates/ask.html:25
#, python-format
msgid ""
-"YYour email, %%(email)s has not yet been validated. To post messages you "
-"must verify your email, please see more details here. You can submit "
-"your question now and validate email after that. Meanwhile, your question "
-"will saved as pending."
+"Your email, %(email)s has not yet been validated. To post messages you must "
+"verify your email, please see more "
+"details here. You can submit your question now and validate email after "
+"that. Meanwhile, your question will saved as pending."
msgstr ""
#: templates/ask.html:29
@@ -4615,7 +4601,7 @@ msgstr "銀牌:偶爾頒發之優質獎章"
msgid "bronze badge: often given as a special honor"
msgstr "第三名獎勵:授予之特殊榮譽"
-#: templates/base.html:19
+#: templates/base.html:22
#, python-format
msgid "RSS feed from %(site_title)s"
msgstr ""
@@ -5100,61 +5086,61 @@ msgstr "當前總票數"
msgid "anonymous user"
msgstr ""
-#: templates/macros.html:94 templates/macros.html.py:113
+#: templates/macros.html:91 templates/macros.html.py:110
msgid "asked"
msgstr "提問於"
-#: templates/macros.html:96 templates/macros.html.py:115
+#: templates/macros.html:93 templates/macros.html.py:112
msgid "answered"
msgstr ""
-#: templates/macros.html:98 templates/macros.html.py:117
+#: templates/macros.html:95 templates/macros.html.py:114
msgid "posted"
msgstr ""
-#: templates/macros.html:104
+#: templates/macros.html:101
msgid "this post is marked as community wiki"
msgstr ""
-#: templates/macros.html:107
+#: templates/macros.html:104
#, python-format
msgid ""
"This post is a wiki.\n"
" Anyone with karma >%(wiki_min_rep)s is welcome to improve it."
msgstr ""
-#: templates/macros.html:149
+#: templates/macros.html:146
msgid "updated"
msgstr "更新"
-#: templates/macros.html:264 templates/macros.html.py:270
+#: templates/macros.html:261 templates/macros.html.py:267
msgid "Leave this group"
msgstr ""
-#: templates/macros.html:265 templates/macros.html.py:267
-#: templates/macros.html:286
+#: templates/macros.html:262 templates/macros.html.py:264
+#: templates/macros.html:283
msgid "Join this group"
msgstr ""
-#: templates/macros.html:266 templates/macros.html.py:271
-#: templates/macros.html:281
+#: templates/macros.html:263 templates/macros.html.py:268
+#: templates/macros.html:278
msgid "You are a member"
msgstr ""
-#: templates/macros.html:273
+#: templates/macros.html:270
msgid "Cancel application"
msgstr ""
-#: templates/macros.html:274 templates/macros.html.py:283
+#: templates/macros.html:271 templates/macros.html.py:280
msgid "Waiting approval"
msgstr ""
-#: templates/macros.html:276 templates/macros.html.py:277
-#: templates/macros.html:288
+#: templates/macros.html:273 templates/macros.html.py:274
+#: templates/macros.html:285
msgid "Ask to join"
msgstr ""
-#: templates/macros.html:317
+#: templates/macros.html:314
#, python-format
msgid "see questions tagged '%(tag)s'"
msgstr "查看有關 '%(tag)s' 的問題"
@@ -5163,86 +5149,86 @@ msgstr "查看有關 '%(tag)s' 的問題"
msgid "delete this comment"
msgstr "刪除任何一個評論"
-#: templates/macros.html:437 templates/revisions.html:38
+#: templates/macros.html:443 templates/revisions.html:38
#: templates/revisions.html.py:41 templates/question/answer_controls.html:5
#: templates/question/question_controls.html:1
msgid "edit"
msgstr "編輯"
-#: templates/macros.html:441
+#: templates/macros.html:452
msgid "convert to answer"
msgstr ""
-#: templates/macros.html:576
+#: templates/macros.html:579
#, python-format
msgid "follow %(alias)s"
msgstr ""
-#: templates/macros.html:579
+#: templates/macros.html:582
#, python-format
msgid "unfollow %(alias)s"
msgstr ""
-#: templates/macros.html:580
+#: templates/macros.html:583
#, python-format
msgid "following %(alias)s"
msgstr ""
-#: templates/macros.html:658 templatetags/extra_tags.py:44
+#: templates/macros.html:662 templatetags/extra_tags.py:44
#, python-format
msgid "%(username)s gravatar image"
msgstr "%(username)s 大頭貼"
-#: templates/macros.html:667
+#: templates/macros.html:671
#, python-format
msgid "%(username)s's website is %(url)s"
msgstr ""
-#: templates/macros.html:682 templates/macros.html.py:683
-#: templates/macros.html:721 templates/macros.html.py:722
+#: templates/macros.html:686 templates/macros.html.py:687
+#: templates/macros.html:725 templates/macros.html.py:726
msgid "previous"
msgstr "上一頁"
-#: templates/macros.html:694 templates/macros.html.py:733
+#: templates/macros.html:698 templates/macros.html.py:737
msgid "current page"
msgstr "當前頁"
-#: templates/macros.html:696 templates/macros.html.py:703
-#: templates/macros.html:735 templates/macros.html.py:742
+#: templates/macros.html:700 templates/macros.html.py:707
+#: templates/macros.html:739 templates/macros.html.py:746
#, python-format
msgid "page %(num)s"
msgstr ""
-#: templates/macros.html:707 templates/macros.html.py:746
+#: templates/macros.html:711 templates/macros.html.py:750
msgid "next page"
msgstr "下一頁"
-#: templates/macros.html:758
+#: templates/macros.html:762
#, python-format
msgid "responses for %(username)s"
msgstr ""
-#: templates/macros.html:761
+#: templates/macros.html:765
#, python-format
msgid "you have %(response_count)s new response"
msgid_plural "you have %(response_count)s new responses"
msgstr[0] ""
-#: templates/macros.html:764
+#: templates/macros.html:768
msgid "no new responses yet"
msgstr ""
-#: templates/macros.html:779 templates/macros.html.py:780
+#: templates/macros.html:783 templates/macros.html.py:784
#, python-format
msgid "%(new)s new flagged posts and %(seen)s previous"
msgstr ""
-#: templates/macros.html:782 templates/macros.html.py:783
+#: templates/macros.html:786 templates/macros.html.py:787
#, python-format
msgid "%(new)s new flagged posts"
msgstr ""
-#: templates/macros.html:788 templates/macros.html.py:789
+#: templates/macros.html:792 templates/macros.html.py:793
#, python-format
msgid "%(seen)s flagged posts"
msgstr ""
@@ -5251,23 +5237,23 @@ msgstr ""
msgid "Questions"
msgstr "問題列表"
-#: templates/question.html:210
+#: templates/question.html:226
msgid "see more comments"
msgstr ""
-#: templates/question.html:212 templates/question.html.py:315
+#: templates/question.html:228 templates/question.html.py:331
msgid "post a comment"
msgstr ""
-#: templates/question.html:225 templates/question/content.html:46
+#: templates/question.html:241 templates/question/content.html:46
msgid "Answer Your Own Question"
msgstr "回答問題"
-#: templates/question.html:230
+#: templates/question.html:246
msgid "Post Your Answer"
msgstr ""
-#: templates/question.html:236 templates/widgets/ask_form.html:46
+#: templates/question.html:252 templates/widgets/ask_form.html:64
msgid "Login/Signup to Post"
msgstr ""
@@ -5275,7 +5261,15 @@ msgstr ""
msgid "Edit question"
msgstr "修改問題"
-#: templates/question_edit.html:52
+#: templates/question_edit.html:16
+msgid "Question - in one sentence"
+msgstr ""
+
+#: templates/question_edit.html:23
+msgid "Details"
+msgstr ""
+
+#: templates/question_edit.html:56
msgid "Change language"
msgstr ""
@@ -5359,66 +5353,66 @@ msgstr ""
msgid "search for tags"
msgstr ""
-#: templates/users.html:4 templates/users.html.py:14
+#: templates/users.html:8 templates/users.html.py:18
#: templates/tags/list_bulk_tag_subscription.html:13
msgid "Users"
msgstr "用戶列表"
-#: templates/users.html:12
+#: templates/users.html:16
#, python-format
msgid "Users in group %(name)s"
msgstr ""
-#: templates/users.html:20
+#: templates/users.html:24
msgid "Select/Sort by »"
msgstr ""
-#: templates/users.html:25
+#: templates/users.html:29
#, python-format
msgid "people in group %(name)s"
msgstr ""
-#: templates/users.html:29 templates/main_page/tab_bar.html:17
+#: templates/users.html:33 templates/main_page/tab_bar.html:17
#: templates/tags/header.html:14
msgid "Sort by »"
msgstr ""
-#: templates/users.html:36
+#: templates/users.html:40
msgid "see people with the highest reputation"
msgstr ""
-#: templates/users.html:37 templates/user_profile/user_info.html:26
+#: templates/users.html:41 templates/user_profile/user_info.html:26
#: templates/user_profile/user_reputation.html:5
#: templates/user_profile/user_tabs.html:24
msgid "karma"
msgstr ""
-#: templates/users.html:43
+#: templates/users.html:47
msgid "see people who joined most recently"
msgstr ""
-#: templates/users.html:44
+#: templates/users.html:48
msgid "recent"
msgstr "最新加入"
-#: templates/users.html:49
+#: templates/users.html:53
msgid "see people who joined the site first"
msgstr ""
-#: templates/users.html:55
+#: templates/users.html:59
msgid "see people sorted by name"
msgstr ""
-#: templates/users.html:56
+#: templates/users.html:60
msgid "by username"
msgstr "用戶名"
-#: templates/users.html:62
+#: templates/users.html:66
#, python-format
msgid "users matching query %(search_query)s:"
msgstr ""
-#: templates/users.html:65
+#: templates/users.html:69
msgid "Nothing found."
msgstr "沒有找到相關數據。"
@@ -5439,97 +5433,29 @@ msgid "Sign in"
msgstr ""
#: templates/authopenid/changeemail.html:2
-#: templates/authopenid/changeemail.html:8
-#: templates/authopenid/changeemail.html:49
msgid "Change Email"
msgstr ""
-#: templates/authopenid/changeemail.html:10
-msgid "Save your email address"
-msgstr "儲存您的電子郵件地址"
-
-#: templates/authopenid/changeemail.html:15
-#, python-format
-msgid ""
-"Enter your new email into the box below if \n"
-"you'd like to use another email for update subscriptions.\n"
-"
Currently you are using %%(email)s"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:19
-#, python-format
-msgid ""
-"Please enter your email address in the box below.\n"
-"Valid email address is required on this Q&A forum. If you like, \n"
-"you can receive updates on interesting questions or entire\n"
-"forum via email. Also, your email is used to create a unique \n"
-"gravatar image for your\n"
-"account. Email addresses are never shown or otherwise shared with anybody\n"
-"else."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:38
-msgid ""
-"Your new Email: \n"
-"(will not be shown to anyone, must be valid)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:41
-msgid ""
-"Your Email (must be valid, never shown to others)"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:49
-msgid "Save Email"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:58
+#: templates/authopenid/changeemail.html:6
msgid "Validate email"
msgstr ""
-#: templates/authopenid/changeemail.html:61
+#: templates/authopenid/changeemail.html:9
#, python-format
msgid ""
"An email with a validation link has been sent to \n"
-"%%(email)s. Please follow the emailed link with your \n"
+"%(email)s. Please follow the emailed link with your \n"
"web browser. Email validation is necessary to help insure the proper use of \n"
"email on Q&A. If you would like to use \n"
"another email, please change it again."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:70
-msgid "Email not changed"
-msgstr "電子信箱不變"
-
-#: templates/authopenid/changeemail.html:73
-#, python-format
-msgid ""
-"Your email address %%(email)s has not been changed.\n"
-" If you decide to change it later - you can always do it by editing \n"
-"it in your user profile or by using the previous form again."
+"href='%(change_email_url)s'>change it again."
msgstr ""
-#: templates/authopenid/changeemail.html:80
-msgid "Email changed"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:83
-#, python-format
-msgid ""
-"\n"
-"Your email address is now set to %%(email)s. \n"
-"Updates on the questions that you like most will be sent to this address. \n"
-"Email notifications are sent once a day or less frequently - only when there \n"
-"are any news."
-msgstr ""
-
-#: templates/authopenid/changeemail.html:91
+#: templates/authopenid/changeemail.html:18
msgid "Email verified"
msgstr "驗證過電子信箱"
-#: templates/authopenid/changeemail.html:94
+#: templates/authopenid/changeemail.html:21
msgid ""
"Thank you for verifying your email! Now \n"
"you can ask and answer questions. Also if \n"
@@ -5538,19 +5464,6 @@ msgid ""
"or less frequently."
msgstr ""
-#: templates/authopenid/changeemail.html:102
-msgid "Validation email not sent"
-msgstr ""
-
-#: templates/authopenid/changeemail.html:105
-#, python-format
-msgid ""
-"Your current email address %%(email)s has been \n"
-"validated before so the new key was not sent. You can change email used for update subscriptions if \n"
-"necessary."
-msgstr ""
-
#: templates/authopenid/complete.html:21
msgid "Registration"
msgstr ""
@@ -5721,7 +5634,7 @@ msgid "Login or email"
msgstr ""
#: templates/authopenid/signin.html:113
-#: templates/authopenid/widget_signin.html:113 utils/forms.py:266
+#: templates/authopenid/widget_signin.html:113 utils/forms.py:264
msgid "Password"
msgstr "密碼"
@@ -5740,6 +5653,12 @@ msgstr ""
msgid "Please, retype"
msgstr ""
+#: templates/authopenid/signin.html:148
+#: templates/authopenid/widget_signin.html:148
+#: templates/livesettings/site_settings.html:24
+msgid "Change password"
+msgstr "修改密碼"
+
#: templates/authopenid/signin.html:162
#: templates/authopenid/widget_signin.html:162
msgid "Here are your current login methods"
@@ -6045,7 +5964,7 @@ msgid ""
" "
msgstr ""
-#: templates/email/notify_author_about_approved_post.html:20
+#: templates/email/notify_author_about_approved_post.html:21
msgid "Below is a copy of your post:"
msgstr ""
@@ -6067,22 +5986,30 @@ msgstr[0] ""
msgid "Great, you are ready to use %(site_name)s!"
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:6
+#: templates/email/re_welcome_lamson_on.html:7
#, python-format
msgid "You can post questions by emailing them at %(ask_address)s."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:7
+#: templates/email/re_welcome_lamson_on.html:8
msgid ""
"When you receive update notifications, you will be able to respond to them, "
"also by email."
msgstr ""
-#: templates/email/re_welcome_lamson_on.html:8
+#: templates/email/re_welcome_lamson_on.html:9
#, python-format
msgid ""
"Of course, you can always visit the %(site_name)s at %(site_url)s"
+"href=\"%(site_url)s\">%(site_url)s."
+msgstr ""
+
+#: templates/email/re_welcome_lamson_on.html:11
+#: templates/email/welcome_lamson_off.html:10
+#, python-format
+msgid ""
+"Please visit %(site_name)s at %(site_url)s, we "
+"look forward to your posts."
msgstr ""
#: templates/email/rejected_post.html:2 templates/email/rejected_post.html:3
@@ -6111,10 +6038,6 @@ msgstr ""
msgid "Welcome to %(site_name)s!"
msgstr ""
-#: templates/email/welcome_lamson_off.html:10
-msgid "We look forward to your Questions!"
-msgstr ""
-
#: templates/email/welcome_lamson_on.html:11
msgid ""
"Important: Please reply to this message, without editing it. We "
@@ -6129,10 +6052,6 @@ msgid ""
"questions on %(site_name)s by email."
msgstr ""
-#: templates/embed/ask_by_widget.html:170
-msgid "Please enter a descriptive title for your question"
-msgstr ""
-
#: templates/embed/list_widgets.html:44
msgid "How to use?"
msgstr ""
@@ -6221,7 +6140,64 @@ msgstr ""
msgid "there are no messages yet..."
msgstr ""
-#: templates/main_page/headline.html:4 views/readers.py:154
+#: templates/livesettings/_admin_site_views.html:4
+msgid "Sites"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:4
+msgid "Settings"
+msgstr ""
+
+#: templates/livesettings/group_settings.html:9
+#: templates/livesettings/site_settings.html:51
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+
+#: templates/livesettings/group_settings.html:16
+#, python-format
+msgid "Settings included in %(name)s."
+msgstr ""
+
+#: templates/livesettings/group_settings.html:50
+#: templates/livesettings/site_settings.html:98
+msgid "You don't have permission to edit values."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Documentation"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:24
+msgid "Log out"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:27
+msgid "Home"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:28
+msgid "Edit Site Settings"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:44
+msgid "Livesettings are disabled for this site."
+msgstr ""
+
+#: templates/livesettings/site_settings.html:45
+msgid "All configuration options must be edited in the site settings.py file"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:67
+#, python-format
+msgid "Group settings: %(name)s"
+msgstr ""
+
+#: templates/livesettings/site_settings.html:94
+msgid "Uncollapse all"
+msgstr ""
+
+#: templates/main_page/headline.html:4 views/readers.py:149
#, python-format
msgid "%(q_num)s question"
msgid_plural "%(q_num)s questions"
@@ -6308,8 +6284,8 @@ msgid "Did not find what you were looking for?"
msgstr "找不到結果? "
#: templates/main_page/questions_loop.html:10
-msgid "Please, post your question!"
-msgstr "現在提問"
+msgid "Ask your question!"
+msgstr ""
#: templates/main_page/tab_bar.html:11
msgid "subscribe to the questions feed"
@@ -6353,7 +6329,7 @@ msgid ""
"please use up to %(tag_count)s tags, less than %(max_chars)s characters each"
msgstr ""
-#: templates/question/answer_card.html:20
+#: templates/question/answer_card.html:21
msgid "This response is published"
msgstr ""
@@ -6714,7 +6690,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:751
+#: templates/tags/list_bulk_tag_subscription.html:48 views/commands.py:759
msgid "Edit"
msgstr ""
@@ -6849,6 +6825,35 @@ msgstr ""
msgid "Edit this reason"
msgstr ""
+#: templates/user_profile/twitter_sharing_controls.html:8
+#, python-format
+msgid "Auto-tweeting to @%(handle)s"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:19
+msgid "stop tweeting"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:23
+msgid "Auto-tweeting is inactive"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:26
+msgid "Select twitter account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:28
+msgid "use another account"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:32
+msgid "Auto-tweeting is off"
+msgstr ""
+
+#: templates/user_profile/twitter_sharing_controls.html:33
+msgid "Start tweeting"
+msgstr ""
+
#: templates/user_profile/user.html:12
#, python-format
msgid "%(username)s's profile"
@@ -6960,24 +6965,24 @@ msgstr "上次活動時間"
msgid "website"
msgstr ""
-#: templates/user_profile/user_info.html:93
+#: templates/user_profile/user_info.html:100
msgid "location"
msgstr "城市"
-#: templates/user_profile/user_info.html:100
+#: templates/user_profile/user_info.html:107
msgid "age"
msgstr "年齡"
-#: templates/user_profile/user_info.html:101
+#: templates/user_profile/user_info.html:108
#, python-format
msgid "%(age)s years old"
msgstr ""
-#: templates/user_profile/user_info.html:106
+#: templates/user_profile/user_info.html:113
msgid "todays unused votes"
msgstr "今日剩餘投票數"
-#: templates/user_profile/user_info.html:107
+#: templates/user_profile/user_info.html:114
msgid "votes left"
msgstr "票"
@@ -7074,19 +7079,19 @@ msgid "Followed by %(count)s person"
msgid_plural "Followed by %(count)s people"
msgstr[0] ""
-#: templates/user_profile/user_network.html:21
+#: templates/user_profile/user_network.html:20
#, python-format
msgid "Following %(count)s person"
msgid_plural "Following %(count)s people"
msgstr[0] ""
-#: templates/user_profile/user_network.html:33
+#: templates/user_profile/user_network.html:31
msgid ""
"Your network is empty. Would you like to follow someone? - Just visit their "
"profiles and click \"follow\""
msgstr ""
-#: templates/user_profile/user_network.html:35
+#: templates/user_profile/user_network.html:33
#, python-format
msgid "%(username)s's network is empty"
msgstr ""
@@ -7180,7 +7185,7 @@ msgstr ""
msgid "User profile"
msgstr "用戶資料"
-#: templates/user_profile/user_tabs.html:10 views/users.py:876
+#: templates/user_profile/user_tabs.html:10 views/users.py:873
msgid "comments and answers to others questions"
msgstr "其他用戶的回覆和評論"
@@ -7196,7 +7201,7 @@ msgstr ""
msgid "questions that user is following"
msgstr ""
-#: templates/user_profile/user_tabs.html:36 views/users.py:918
+#: templates/user_profile/user_tabs.html:36 views/users.py:915
msgid "user vote record"
msgstr "用戶投票記錄"
@@ -7205,11 +7210,11 @@ msgstr "用戶投票記錄"
msgid "votes"
msgstr "投票"
-#: templates/user_profile/user_tabs.html:42 views/users.py:1030
+#: templates/user_profile/user_tabs.html:42 views/users.py:1027
msgid "email subscription settings"
msgstr "email 訂閱設定"
-#: templates/user_profile/user_tabs.html:48 views/users.py:286
+#: templates/user_profile/user_tabs.html:48 views/users.py:283
msgid "moderate this user"
msgstr ""
@@ -7230,7 +7235,15 @@ msgstr "盡量答覆問題,而非討論。"
msgid "Ask the Group"
msgstr ""
-#: templates/widgets/ask_form.html:40
+#: templates/widgets/ask_form.html:21 templates/widgets/ask_form.html.py:23
+msgid "Add details (optional)"
+msgstr ""
+
+#: templates/widgets/ask_form.html:25
+msgid "Add details"
+msgstr ""
+
+#: templates/widgets/ask_form.html:58
msgid "Select language"
msgstr ""
@@ -7238,23 +7251,23 @@ msgstr ""
msgid "Contributors"
msgstr "貢獻者"
-#: templates/widgets/edit_post.html:42
+#: templates/widgets/edit_post.html:33
msgid ", one of these is required"
msgstr ""
-#: templates/widgets/edit_post.html:51 templates/widgets/edit_post.html:56
+#: templates/widgets/edit_post.html:42 templates/widgets/edit_post.html:47
msgid "tags:"
msgstr ""
-#: templates/widgets/edit_post.html:52
+#: templates/widgets/edit_post.html:43
msgid "(required)"
msgstr "(必要的)"
-#: templates/widgets/edit_post.html:81
+#: templates/widgets/edit_post.html:71
msgid "Toggle the real time Markdown editor preview"
msgstr "切換為 Markdown 編輯器的即時預覽"
-#: templates/widgets/edit_post.html:96
+#: templates/widgets/edit_post.html:86
msgid ""
"To post on behalf of someone else, enter user name and "
"email below."
@@ -7522,23 +7535,23 @@ msgstr ""
msgid "widgets"
msgstr ""
-#: templatetags/extra_filters_jinja.py:308
+#: templatetags/extra_filters_jinja.py:319
msgid "no"
msgstr ""
-#: utils/decorators.py:103 views/commands.py:146
+#: utils/decorators.py:104 views/commands.py:146
msgid "Oops, apologies - there was some error"
msgstr ""
-#: utils/decorators.py:122
+#: utils/decorators.py:123
msgid "Please login to post"
msgstr ""
-#: utils/decorators.py:218
+#: utils/decorators.py:219
msgid "Spam was detected on your post, sorry for if this is a mistake"
msgstr ""
-#: utils/decorators.py:242
+#: utils/decorators.py:243
msgid "This function is limited to moderators and administrators"
msgstr ""
@@ -7602,37 +7615,37 @@ msgstr ""
msgid "this email address is not authorized"
msgstr ""
-#: utils/forms.py:267
+#: utils/forms.py:265
msgid "password is required"
msgstr " 密碼不能為空白。"
-#: utils/forms.py:270
+#: utils/forms.py:268
msgid "Password (please retype)"
msgstr ""
-#: utils/forms.py:271
+#: utils/forms.py:269
msgid "please, retype your password"
msgstr ""
-#: utils/forms.py:272
+#: utils/forms.py:270
msgid "sorry, entered passwords did not match, please try again"
msgstr "對不起, 密碼不合, 請重新輸入"
-#: utils/functions.py:101
+#: utils/functions.py:102
msgid "2 days ago"
msgstr ""
-#: utils/functions.py:103
+#: utils/functions.py:104
msgid "yesterday"
msgstr "昨天"
-#: utils/functions.py:106
+#: utils/functions.py:107
#, python-format
msgid "%(hr)d hour ago"
msgid_plural "%(hr)d hours ago"
msgstr[0] ""
-#: utils/functions.py:112
+#: utils/functions.py:113
#, python-format
msgid "%(min)d min ago"
msgid_plural "%(min)d mins ago"
@@ -7690,46 +7703,50 @@ msgstr ""
msgid "email update frequency has been set to daily"
msgstr "電子郵件每日更新"
-#: views/commands.py:693
+#: views/commands.py:628
+msgid "Sorry, could not delete tag"
+msgstr ""
+
+#: views/commands.py:701
#, python-format
msgid "Tag subscription was canceled (undo)."
msgstr ""
-#: views/commands.py:702
+#: views/commands.py:710
#, python-format
msgid "Please sign in to subscribe for: %(tags)s"
msgstr ""
-#: views/commands.py:721
+#: views/commands.py:729
msgid "Create"
msgstr ""
-#: views/commands.py:950
+#: views/commands.py:959
msgid "Please sign in to vote"
msgstr ""
-#: views/commands.py:971
+#: views/commands.py:980
msgid "Please sign in to delete/restore posts"
msgstr ""
-#: views/commands.py:1393 views/commands.py:1426
+#: views/commands.py:1402 views/commands.py:1435
msgid "Sorry, looks like sharing request was invalid"
msgstr ""
-#: views/commands.py:1449
+#: views/commands.py:1458
#, python-format
msgid "%(user)s, welcome to group %(group)s!"
msgstr ""
-#: views/commands.py:1506
+#: views/commands.py:1515
msgid "Sorry, only thread moderators can use this function"
msgstr ""
-#: views/commands.py:1521
+#: views/commands.py:1530
msgid "The answer is now unpublished"
msgstr ""
-#: views/commands.py:1525
+#: views/commands.py:1534
msgid "The answer is now published"
msgstr ""
@@ -7758,113 +7775,113 @@ msgstr "期待你的回饋"
msgid "Privacy policy"
msgstr "隱私政策"
-#: views/meta.py:219
+#: views/meta.py:216
msgid "Suggested tags"
msgstr ""
-#: views/readers.py:410
+#: views/readers.py:402
msgid ""
"Sorry, the comment you are looking for has been deleted and is no longer "
"accessible"
msgstr ""
-#: views/users.py:287
+#: views/users.py:284
msgid "moderate user"
msgstr ""
-#: views/users.py:505
+#: views/users.py:502
msgid "user profile"
msgstr "用戶資料"
-#: views/users.py:506
+#: views/users.py:503
msgid "user profile overview"
msgstr "用戶概覽"
-#: views/users.py:707
+#: views/users.py:704
msgid "recent user activity"
msgstr "最近活動"
-#: views/users.py:708
+#: views/users.py:705
msgid "profile - recent activity"
msgstr "最近活動"
-#: views/users.py:739
+#: views/users.py:736
msgid "group joining requests"
msgstr ""
-#: views/users.py:740
+#: views/users.py:737
msgid "profile - moderation"
msgstr ""
-#: views/users.py:796
+#: views/users.py:793
msgid "private messages"
msgstr ""
-#: views/users.py:797
+#: views/users.py:794
msgid "profile - messages"
msgstr ""
-#: views/users.py:877
+#: views/users.py:874
msgid "profile - responses"
msgstr "用戶資料 - 回應 "
-#: views/users.py:919
+#: views/users.py:916
msgid "profile - votes"
msgstr "用戶資料 - 投票"
-#: views/users.py:940
+#: views/users.py:937
msgid "user karma"
msgstr ""
-#: views/users.py:941
+#: views/users.py:938
msgid "Profile - User's Karma"
msgstr ""
-#: views/users.py:959
+#: views/users.py:956
msgid "users favorite questions"
msgstr "用戶收藏的問題"
-#: views/users.py:960
+#: views/users.py:957
msgid "profile - favorite questions"
msgstr "用戶資料 - 收藏"
-#: views/users.py:1001 views/users.py:1005
+#: views/users.py:998 views/users.py:1002
msgid "changes saved"
msgstr "儲存修改"
-#: views/users.py:1011
+#: views/users.py:1008
msgid "email updates canceled"
msgstr "取消電子郵件更新"
-#: views/users.py:1031
+#: views/users.py:1028
msgid "profile - email subscriptions"
msgstr ""
-#: views/users.py:1052
+#: views/users.py:1049
#, python-format
msgid "profile - %(section)s"
msgstr ""
-#: views/writers.py:73
+#: views/writers.py:72
msgid "Sorry, anonymous users cannot upload files"
msgstr ""
-#: views/writers.py:91
+#: views/writers.py:90
#, python-format
msgid "allowed file types are '%(file_types)s'"
msgstr "只允許上傳 '%(file_types)s' 類型的文件!"
-#: views/writers.py:104
+#: views/writers.py:103
#, python-format
msgid "maximum upload file size is %(file_size)sK"
msgstr ""
-#: views/writers.py:112
+#: views/writers.py:111
msgid ""
"Error uploading file. Please contact the site administrator. Thank you."
msgstr ""
-#: views/writers.py:209
+#: views/writers.py:208
msgid ""
"You are welcome to start submitting your question"
" anonymously. When you submit the post, you will be redirected to the"
@@ -7873,45 +7890,45 @@ msgid ""
"Login takes about 30 seconds, initial signup takes a minute or less."
msgstr ""
-#: views/writers.py:571
+#: views/writers.py:575
msgid "Please log in to answer questions"
msgstr ""
-#: views/writers.py:710
+#: views/writers.py:701
msgid "This content is forbidden"
msgstr ""
-#: views/writers.py:719
+#: views/writers.py:710
msgid "Post not found"
msgstr ""
-#: views/writers.py:727
+#: views/writers.py:718
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot post comments. Please sign in."
msgstr ""
-#: views/writers.py:746
+#: views/writers.py:742
msgid "Sorry, anonymous users cannot edit comments"
msgstr ""
-#: views/writers.py:795
+#: views/writers.py:791
#, python-format
msgid ""
"Sorry, you appear to be logged out and cannot delete comments. Please sign in."
msgstr ""
-#: views/writers.py:821
+#: views/writers.py:817
msgid "sorry, we seem to have some technical difficulties"
msgstr ""
-#: views/writers.py:885
+#: views/writers.py:881
msgid "Error - could not find the destination post"
msgstr ""
-#: views/writers.py:909
+#: views/writers.py:905
#, python-format
msgid ""
"Cannot convert, because text has more characters than %(max_chars)s - "
diff --git a/askbot/locale/zh_TW/LC_MESSAGES/djangojs.po b/askbot/locale/zh_TW/LC_MESSAGES/djangojs.po
index 53840d76..194bf451 100644
--- a/askbot/locale/zh_TW/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/zh_TW/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: askbot\n"
"Report-Msgid-Bugs-To: http://askbot.org/\n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
-"PO-Revision-Date: 2013-04-14 02:32+0000\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
+"PO-Revision-Date: 2013-05-18 18:49+0000\n"
"Last-Translator: evgeny
"
-msgstr ""
-
-#: media/js/post.js:2260
+#: media/js/post.js:2391
msgid "please sign in or register to post comments"
msgstr ""
-#: media/js/post.js:2412
+#: media/js/post.js:2542
msgid "Please enter question title (>10 characters)"
msgstr ""
-#: media/js/post.js:2855 media/js/post.js.c:3641 media/js/post.js.c:3830
+#: media/js/post.js:3053 media/js/post.js.c:3839 media/js/post.js.c:4028
msgid "save"
msgstr ""
-#: media/js/post.js:2979
+#: media/js/post.js:3177
msgid "Enter the logo url or upload an image"
msgstr ""
-#: media/js/post.js:3005
+#: media/js/post.js:3203
msgid "Do you really want to remove the image?"
msgstr ""
-#: media/js/post.js:3113
+#: media/js/post.js:3311
msgid "change logo"
msgstr ""
-#: media/js/post.js:3114
+#: media/js/post.js:3312
msgid "add logo"
msgstr ""
-#: media/js/post.js:3216
+#: media/js/post.js:3414
#, c-format
msgid "tag \"%s\" was already added, no need to repeat (press \"escape\" to delete)"
msgstr ""
-#: media/js/post.js:3225
+#: media/js/post.js:3423
#, c-format
msgid "a maximum of %s tag is allowed"
msgid_plural "a maximum of %s tags are allowed"
msgstr[0] ""
-#: media/js/post.js:3571
+#: media/js/post.js:3769
msgid "Delete category?"
msgstr ""
-#: media/js/post.js:3660 media/js/utils.js:851
+#: media/js/post.js:3858 media/js/utils.js:870
msgid "edit"
msgstr ""
-#: media/js/post.js:3747
+#: media/js/post.js:3945
msgid "category name cannot be empty"
msgstr ""
-#: media/js/post.js:3783
+#: media/js/post.js:3981
msgid "already exists at the current level!"
msgstr ""
-#: media/js/post.js:3819
+#: media/js/post.js:4017
msgid "add category"
msgstr ""
-#: media/js/post.js:4366
+#: media/js/post.js:4564
msgid "save tags"
msgstr ""
-#: media/js/post.js:4448 media/js/post.js.c:4482
+#: media/js/post.js:4646 media/js/post.js.c:4680
msgid "User name:"
msgstr ""
-#: media/js/post.js:4469
+#: media/js/post.js:4667
msgid "Group name:"
msgstr ""
-#: media/js/post.js:4495
+#: media/js/post.js:4693
msgid "Shared with the following users:"
msgstr ""
-#: media/js/post.js:4501
+#: media/js/post.js:4699
msgid "Shared with the following groups:"
msgstr ""
@@ -484,201 +488,205 @@ msgstr ""
msgid "add"
msgstr ""
-#: media/js/utils.js:79
+#: media/js/utils.js:94
msgid "and"
msgstr ""
-#: media/js/utils.js:97
+#: media/js/utils.js:112
msgid "click to close"
msgstr "點擊消息框關閉"
-#: media/js/utils.js:850
+#: media/js/utils.js:869
msgid "click to edit this comment"
msgstr ""
-#: media/js/utils.js:875
+#: media/js/utils.js:894
msgid "convert to answer"
msgstr ""
-#: media/js/utils.js:928
+#: media/js/utils.js:947
msgid "Ok"
msgstr ""
-#: media/js/utils.js:929 media/js/utils.js.c:1377
+#: media/js/utils.js:948 media/js/utils.js.c:1396
msgid "Cancel"
msgstr ""
-#: media/js/utils.js:1189
+#: media/js/utils.js:1208
#, c-format
msgid "Uploaded file: %s"
msgstr ""
-#: media/js/utils.js:1204
+#: media/js/utils.js:1223
msgid "Choose a different image"
msgstr ""
-#: media/js/utils.js:1206
+#: media/js/utils.js:1225
msgid "Choose a different file"
msgstr ""
-#: media/js/utils.js:1220
+#: media/js/utils.js:1239
msgid "Oops, looks like we had an error. Sorry."
msgstr ""
-#: media/js/utils.js:1281
+#: media/js/utils.js:1300
msgid "Choose an image to insert"
msgstr ""
-#: media/js/utils.js:1283
+#: media/js/utils.js:1302
msgid "Choose a file to insert"
msgstr ""
-#: media/js/utils.js:1296
+#: media/js/utils.js:1315
msgid "Allowed file types are:"
msgstr ""
-#: media/js/utils.js:1302
+#: media/js/utils.js:1321
#: media/js/tinymce/plugins/askbot_attachment/editor_plugin.js:35
msgid "Or paste file url here"
msgstr ""
-#: media/js/utils.js:1376
+#: media/js/utils.js:1395
msgid "Save"
msgstr ""
-#: media/js/utils.js:1448
+#: media/js/utils.js:1467
msgid "saved"
msgstr ""
-#: media/js/utils.js:1572
+#: media/js/utils.js:1591
msgid "enabled"
msgstr ""
-#: media/js/utils.js:1574
+#: media/js/utils.js:1593
msgid "disabled"
msgstr ""
-#: media/js/utils.js:2065
+#: media/js/utils.js:2023
+msgid "add new group"
+msgstr ""
+
+#: media/js/utils.js:2084
msgid "Group %(name)s already exists. Group names are case-insensitive."
msgstr ""
-#: media/js/utils.js:2256
+#: media/js/utils.js:2275
#, c-format
msgid "see questions tagged '%s'"
msgstr ""
-#: media/js/utils.js:3149
+#: media/js/utils.js:3168
msgid "ago"
msgstr ""
-#: media/js/utils.js:3150
+#: media/js/utils.js:3169
msgid "from now"
msgstr ""
-#: media/js/utils.js:3152
+#: media/js/utils.js:3171
msgid "about a minute"
msgstr ""
-#: media/js/utils.js:3153
+#: media/js/utils.js:3172
#, c-format
msgid "%d minutes"
msgstr ""
-#: media/js/utils.js:3154
+#: media/js/utils.js:3173
msgid "about an hour"
msgstr ""
-#: media/js/utils.js:3155
+#: media/js/utils.js:3174
#, c-format
msgid "%d hours"
msgstr ""
-#: media/js/utils.js:3156 media/js/utils.js.c:3284
+#: media/js/utils.js:3175 media/js/utils.js.c:3303
msgid "yesterday"
msgstr ""
-#: media/js/utils.js:3157
+#: media/js/utils.js:3176
#, c-format
msgid "%d days"
msgstr ""
-#: media/js/utils.js:3158
+#: media/js/utils.js:3177
msgid "about a month"
msgstr ""
-#: media/js/utils.js:3159
+#: media/js/utils.js:3178
#, c-format
msgid "%d months"
msgstr ""
-#: media/js/utils.js:3160
+#: media/js/utils.js:3179
msgid "about a year"
msgstr ""
-#: media/js/utils.js:3161
+#: media/js/utils.js:3180
#, c-format
msgid "%d years"
msgstr ""
-#: media/js/utils.js:3259
+#: media/js/utils.js:3278
msgid "Jan"
msgstr ""
-#: media/js/utils.js:3260
+#: media/js/utils.js:3279
msgid "Feb"
msgstr ""
-#: media/js/utils.js:3261
+#: media/js/utils.js:3280
msgid "Mar"
msgstr ""
-#: media/js/utils.js:3262
+#: media/js/utils.js:3281
msgid "Apr"
msgstr ""
-#: media/js/utils.js:3263
+#: media/js/utils.js:3282
msgid "May"
msgstr ""
-#: media/js/utils.js:3264
+#: media/js/utils.js:3283
msgid "Jun"
msgstr ""
-#: media/js/utils.js:3265
+#: media/js/utils.js:3284
msgid "Jul"
msgstr ""
-#: media/js/utils.js:3266
+#: media/js/utils.js:3285
msgid "Aug"
msgstr ""
-#: media/js/utils.js:3267
+#: media/js/utils.js:3286
msgid "Sep"
msgstr ""
-#: media/js/utils.js:3268
+#: media/js/utils.js:3287
msgid "Oct"
msgstr ""
-#: media/js/utils.js:3269
+#: media/js/utils.js:3288
msgid "Nov"
msgstr ""
-#: media/js/utils.js:3270
+#: media/js/utils.js:3289
msgid "Dec"
msgstr ""
-#: media/js/utils.js:3282
+#: media/js/utils.js:3301
msgid "2 days ago"
msgstr ""
-#: media/js/utils.js:3289
+#: media/js/utils.js:3308
#, c-format
msgid "%s hour ago"
msgid_plural "%s hours ago"
msgstr[0] ""
-#: media/js/utils.js:3299
+#: media/js/utils.js:3318
#, c-format
msgid "%s min ago"
msgid_plural "%s mins ago"
@@ -740,7 +748,7 @@ msgstr "水平線"
msgid "undo"
msgstr "撤銷"
-#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1174
+#: media/js/wmd/wmd.js:43 media/js/wmd/wmd.js.c:1169
msgid "redo"
msgstr "重做"
@@ -756,15 +764,15 @@ msgstr "輸入Web地址
示例:
http://www.cnprog.com/ \"
msgid "upload file attachment"
msgstr ""
-#: media/js/wmd/wmd.js:1841
+#: media/js/wmd/wmd.js:1836
msgid "image description"
msgstr ""
-#: media/js/wmd/wmd.js:1844
+#: media/js/wmd/wmd.js:1839
msgid "file name"
msgstr ""
-#: media/js/wmd/wmd.js:1848
+#: media/js/wmd/wmd.js:1843
msgid "link text"
msgstr ""
--
cgit v1.2.3-1-g7c22