From db956af1b0dc6cdd428ad4099314486c55339770 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 ""
-#: 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 " @@ -3452,11 +3434,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"
@@ -3478,86 +3460,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 "
@@ -3568,56 +3550,56 @@ 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"
@@ -3627,101 +3609,101 @@ 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 ""
@@ -3729,221 +3711,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 ""
@@ -4213,49 +4195,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."
@@ -4277,17 +4267,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 ""
@@ -4487,19 +4477,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
@@ -4507,21 +4492,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 ""
@@ -4534,10 +4519,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
@@ -4631,7 +4616,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 ""
@@ -5118,61 +5103,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 ""
@@ -5181,87 +5166,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 ""
@@ -5270,23 +5255,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 ""
@@ -5294,7 +5279,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 ""
@@ -5378,66 +5371,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 ""
@@ -5458,107 +5451,33 @@ 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"
-"span> 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."
-"span>\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 "
+"%(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."
-"span> \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"
@@ -5570,19 +5489,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 ""
@@ -5761,7 +5667,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 ""
@@ -5780,6 +5686,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"
@@ -6087,7 +5999,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 ""
@@ -6110,22 +6022,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"
+"\">%(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
@@ -6155,10 +6075,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 "
@@ -6173,10 +6089,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 ""
@@ -6266,7 +6178,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"
@@ -6354,7 +6324,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
@@ -6401,7 +6371,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 ""
@@ -6763,7 +6733,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 ""
@@ -6898,6 +6868,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"
@@ -7009,24 +7008,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 ""
@@ -7124,20 +7123,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 ""
@@ -7237,7 +7236,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 ""
@@ -7253,7 +7252,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 ""
@@ -7262,11 +7261,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 ""
@@ -7287,7 +7286,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 ""
@@ -7295,23 +7302,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."
@@ -7581,23 +7588,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 ""
@@ -7661,38 +7668,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"
@@ -7751,46 +7758,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 ""
@@ -7819,112 +7830,112 @@ 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 "
@@ -7933,45 +7944,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/en/LC_MESSAGES/djangojs.po b/askbot/locale/en/LC_MESSAGES/djangojs.po
index b3cce4fd..f271381a 100644
--- a/askbot/locale/en/LC_MESSAGES/djangojs.po
+++ b/askbot/locale/en/LC_MESSAGES/djangojs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.7\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 01:42-0500\n"
+"POT-Creation-Date: 2013-05-18 10:00-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME
"
-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 "edit"
-#: media/js/post.js:3747
+#: media/js/post.js:3945
#, fuzzy
msgid "category name cannot be empty"
msgstr "please enter at least one tag"
-#: 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 ""
@@ -512,202 +516,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 "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"
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"
@@ -773,7 +781,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 ""
@@ -791,15 +799,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 ""
--
cgit v1.2.3-1-g7c22