Browse Source

Sync translations

rafalp 5 years ago
parent
commit
0e7cb864a9

BIN
misago/locale/en/LC_MESSAGES/django.mo


+ 202 - 94
misago/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-13 14:07+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -209,22 +209,21 @@ msgstr ""
 msgid "Only members with valid permissions can post in closed categories."
 msgstr ""
 
-#: categories/admin/forms.py:70 conf/admin/__init__.py:79
+#: categories/admin/forms.py:70 conf/admin/__init__.py:93
 #: templates/misago/admin/categories/list.html:19
 #: templates/misago/admin/dashboard/totals.html:19
 #: templates/misago/navbar.html:20 templates/misago/navbar.html:36
 #: templates/misago/profile/threads.html:5
 #: templates/misago/profile/threads.html:8
 #: templates/misago/profile/threads.html:9
-#: templates/misago/threadslist/category.html:74
+#: templates/misago/threadslist/category.html:68
 #: templates/misago/threadslist/threads.html:14
 #: templates/misago/threadslist/threads.html:16
-#: templates/misago/threadslist/threads.html:18
-#: templates/misago/threadslist/threads.html:35
-#: templates/misago/threadslist/threads.html:44
-#: templates/misago/threadslist/threads.html:68
+#: templates/misago/threadslist/threads.html:33
+#: templates/misago/threadslist/threads.html:42
+#: templates/misago/threadslist/threads.html:66
 #: threads/permissions/threads.py:73 threads/permissions/threads.py:104
-#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:98
+#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:106
 msgid "Threads"
 msgstr ""
 
@@ -442,20 +441,20 @@ msgstr ""
 msgid "You don't have permission to browse \"%(category)s\" contents."
 msgstr ""
 
-#: conf/admin/__init__.py:41 templates/misago/admin/conf/index.html:5
+#: conf/admin/__init__.py:45 templates/misago/admin/conf/index.html:5
 #: templates/misago/admin/themes/form.html:48
 msgid "Settings"
 msgstr ""
 
-#: conf/admin/__init__.py:48 templates/misago/admin/socialauth/form.html:27
+#: conf/admin/__init__.py:52 templates/misago/admin/socialauth/form.html:27
 msgid "General"
 msgstr ""
 
-#: conf/admin/__init__.py:49
+#: conf/admin/__init__.py:53
 msgid "Change forum details like name, description or footer."
 msgstr ""
 
-#: conf/admin/__init__.py:54 templates/misago/admin/dashboard/totals.html:7
+#: conf/admin/__init__.py:58 templates/misago/admin/dashboard/totals.html:7
 #: templates/misago/admin/users/ban.html:22 templates/misago/navbar.html:42
 #: templates/misago/userslists/base.html:5
 #: templates/misago/userslists/base.html:14 users/admin/__init__.py:74
@@ -463,28 +462,38 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: conf/admin/__init__.py:56
+#: conf/admin/__init__.py:60
 msgid "Customize user accounts default behavior and features availability."
 msgstr ""
 
-#: conf/admin/__init__.py:63
+#: conf/admin/__init__.py:67
 msgid "Captcha"
 msgstr ""
 
-#: conf/admin/__init__.py:65
+#: conf/admin/__init__.py:69
 msgid "Setup protection against automatic registrations on the site."
 msgstr ""
 
-#: conf/admin/__init__.py:72 templates/misago/admin/dashboard/analytics.html:7
+#: conf/admin/__init__.py:76
+msgid "Single Sign-On"
+msgstr ""
+
+#: conf/admin/__init__.py:78
+msgid ""
+"SSO enables you to delegate user login and registration from Misago tothe "
+"third party site."
+msgstr ""
+
+#: conf/admin/__init__.py:86 templates/misago/admin/dashboard/analytics.html:7
 #: templates/misago/admin/dashboard/index.html:40
 msgid "Analytics"
 msgstr ""
 
-#: conf/admin/__init__.py:73
+#: conf/admin/__init__.py:87
 msgid "Enable Google Analytics or setup Google Site Verification."
 msgstr ""
 
-#: conf/admin/__init__.py:80
+#: conf/admin/__init__.py:94
 msgid "Threads, posts, polls and attachments options."
 msgstr ""
 
@@ -719,6 +728,39 @@ msgid ""
 "Address under which site is running appears to be \"%(address)s\"."
 msgstr ""
 
+#: conf/admin/forms/sso.py:13
+msgid "Enable Single Sign-On"
+msgstr ""
+
+#: conf/admin/forms/sso.py:15
+msgid ""
+"Enabling SSO will make login option redirect users to the server URL "
+"configured below. It will also disable option to register on forum, change "
+"username, email or passward, as those features will be delegated to the 3rd "
+"party site."
+msgstr ""
+
+#: conf/admin/forms/sso.py:22
+msgid "Public key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:24 conf/admin/forms/sso.py:32
+msgid ""
+"Leave this field empty for Misago to generate this key on form submission."
+msgstr ""
+
+#: conf/admin/forms/sso.py:30
+msgid "Private key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:37
+msgid "Server URL"
+msgstr ""
+
+#: conf/admin/forms/sso.py:50
+msgid "You need to enter server URL to enable SSO."
+msgstr ""
+
 #: conf/admin/forms/threads.py:27
 msgid "Daily post limit per user"
 msgstr ""
@@ -1027,7 +1069,7 @@ msgstr ""
 msgid "This value must be lower than number of users per page."
 msgstr ""
 
-#: conf/admin/views.py:39
+#: conf/admin/views.py:40
 msgid "Settings have been saved."
 msgstr ""
 
@@ -1077,11 +1119,6 @@ msgstr ""
 #: core/templatetags/misago_pagetitle.py:10
 #: templates/misago/thread/private_thread.html:7
 #: templates/misago/thread/thread.html:7
-#: templates/misago/threadslist/category.html:8
-#: templates/misago/threadslist/category.html:13
-#: templates/misago/threadslist/private_threads.html:8
-#: templates/misago/threadslist/private_threads.html:13
-#: templates/misago/threadslist/threads.html:16
 #, python-format
 msgid "page: %(page)s"
 msgstr ""
@@ -1309,15 +1346,28 @@ msgstr ""
 msgid "Privacy policy"
 msgstr ""
 
-#: markup/finalise.py:20
+#: markup/finalize.py:24
 #, python-format
 msgid "%(title)s has written:"
 msgstr ""
 
-#: markup/finalise.py:22
+#: markup/finalize.py:26
 msgid "Quoted message:"
 msgstr ""
 
+#: markup/finalize.py:33
+#, python-format
+msgid "%(title)s:"
+msgstr ""
+
+#: markup/finalize.py:35
+msgid "Spoiler:"
+msgstr ""
+
+#: markup/finalize.py:40
+msgid "Reveal spoiler"
+msgstr ""
+
 #: search/api.py:17 search/views.py:12 search/views.py:21
 msgid "You don't have permission to search site."
 msgstr ""
@@ -1434,6 +1484,18 @@ msgstr ""
 msgid "Please try resubmitting the form."
 msgstr ""
 
+#: socialauth/views.py:23
+msgid "Please use the 3rd party site to login."
+msgstr ""
+
+#: sso/validators.py:24 users/validators.py:79
+msgid "This username is not allowed."
+msgstr ""
+
+#: sso/validators.py:33 users/forms/register.py:45 users/validators.py:51
+msgid "This e-mail address is not allowed."
+msgstr ""
+
 #: templates/misago/acl_debug.html:5
 #, python-format
 msgid ""
@@ -1854,7 +1916,7 @@ msgstr ""
 #: templates/misago/admin/dashboard/totals.html:31
 #: templates/misago/admin/users/list.html:21
 #: templates/misago/profile/posts.html:5 templates/misago/profile/posts.html:8
-#: templates/misago/profile/posts.html:9 users/apps.py:94
+#: templates/misago/profile/posts.html:9 users/apps.py:102
 msgid "Posts"
 msgstr ""
 
@@ -1996,45 +2058,56 @@ msgstr ""
 msgid "Attachment error images"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:8
+#: templates/misago/admin/conf/users_settings.html:9
+#: templates/misago/admin/socialauth/list.html:97
+msgid "Note"
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:9
+msgid ""
+"Single Sign-On is enabled. Site's registration, password and deletion "
+"features have been disabled and delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:14
 msgid "New accounts"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:17 users/admin/forms.py:484
+#: templates/misago/admin/conf/users_settings.html:23 users/admin/forms.py:484
 #: users/admin/forms.py:573
 msgid "Usernames"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:27
+#: templates/misago/admin/conf/users_settings.html:33
 msgid "Avatars"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:43
+#: templates/misago/admin/conf/users_settings.html:49
 msgid "Signatures"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:51
+#: templates/misago/admin/conf/users_settings.html:57
 #: users/admin/__init__.py:80
 msgid "Data downloads"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:60
+#: templates/misago/admin/conf/users_settings.html:66
 msgid "Own account deletion"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:68 users/admin/forms.py:492
+#: templates/misago/admin/conf/users_settings.html:74 users/admin/forms.py:492
 msgid "IP addresses"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:76
+#: templates/misago/admin/conf/users_settings.html:82
 msgid "Default subscription preferences"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:85
+#: templates/misago/admin/conf/users_settings.html:91
 msgid "Users lists"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:94
+#: templates/misago/admin/conf/users_settings.html:100
 msgid "Top posters ranking"
 msgstr ""
 
@@ -2552,7 +2625,7 @@ msgid "Enabled login methods"
 msgstr ""
 
 #: templates/misago/admin/socialauth/list.html:15
-#: templates/misago/admin/socialauth/list.html:106
+#: templates/misago/admin/socialauth/list.html:112
 msgid "Provider"
 msgstr ""
 
@@ -2568,19 +2641,25 @@ msgstr ""
 msgid "Are you sure you want to disable this social login provider?"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:100
+#: templates/misago/admin/socialauth/list.html:97
+msgid ""
+"Single Sign-On is enabled. Social authentication has been disabled and "
+"delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/socialauth/list.html:106
 msgid "Setup new login method"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:119
+#: templates/misago/admin/socialauth/list.html:125
 msgid "Setup login with this provider"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:120
+#: templates/misago/admin/socialauth/list.html:126
 msgid "Setup"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:127
+#: templates/misago/admin/socialauth/list.html:133
 msgid "No new login providers are available for setup at this time."
 msgstr ""
 
@@ -2877,7 +2956,7 @@ msgstr ""
 msgid "Signature"
 msgstr ""
 
-#: templates/misago/admin/users/edit.html:228 users/apps.py:24
+#: templates/misago/admin/users/edit.html:228 users/apps.py:27
 msgid "Forum options"
 msgstr ""
 
@@ -3132,7 +3211,7 @@ msgid ""
 "download."
 msgstr ""
 
-#: templates/misago/emails/data_download.html:11 users/apps.py:52
+#: templates/misago/emails/data_download.html:11 users/apps.py:57
 msgid "Download data"
 msgstr ""
 
@@ -3514,7 +3593,7 @@ msgstr ""
 #: templates/misago/profile/ban_details.html:5
 #: templates/misago/profile/ban_details.html:8
 #: templates/misago/profile/ban_details.html:9
-#: templates/misago/profile/ban_details.html:16 users/apps.py:129
+#: templates/misago/profile/ban_details.html:16 users/apps.py:137
 msgid "Ban details"
 msgstr ""
 
@@ -3563,7 +3642,7 @@ msgstr[1] ""
 #: templates/misago/profile/details.html:5
 #: templates/misago/profile/details.html:8
 #: templates/misago/profile/details.html:9
-#: templates/misago/profile/details.html:19 users/apps.py:116
+#: templates/misago/profile/details.html:19 users/apps.py:124
 msgid "Details"
 msgstr ""
 
@@ -3592,7 +3671,7 @@ msgstr ""
 
 #: templates/misago/profile/followers.html:5
 #: templates/misago/profile/followers.html:8
-#: templates/misago/profile/followers.html:9 users/apps.py:104
+#: templates/misago/profile/followers.html:9 users/apps.py:112
 msgid "Followers"
 msgstr ""
 
@@ -3621,7 +3700,7 @@ msgstr ""
 
 #: templates/misago/profile/follows.html:5
 #: templates/misago/profile/follows.html:8
-#: templates/misago/profile/follows.html:9 users/apps.py:110
+#: templates/misago/profile/follows.html:9 users/apps.py:118
 msgid "Follows"
 msgstr ""
 
@@ -3709,7 +3788,7 @@ msgstr ""
 
 #: templates/misago/profile/username_history.html:5
 #: templates/misago/profile/username_history.html:8
-#: templates/misago/profile/username_history.html:9 users/apps.py:122
+#: templates/misago/profile/username_history.html:9 users/apps.py:130
 msgid "Username history"
 msgstr ""
 
@@ -4020,35 +4099,35 @@ msgstr ""
 msgid "Best answer"
 msgstr ""
 
-#: templates/misago/threadslist/base.html:58
+#: templates/misago/threadslist/base.html:57
 msgid "There are no threads in this category."
 msgstr ""
 
-#: templates/misago/threadslist/base.html:60
+#: templates/misago/threadslist/base.html:59
 msgid "There are no threads on this forum... yet!"
 msgstr ""
 
-#: templates/misago/threadslist/base.html:64
-#: templates/misago/threadslist/private_threads.html:67
+#: templates/misago/threadslist/base.html:63
+#: templates/misago/threadslist/private_threads.html:61
 msgid "Why not start one yourself?"
 msgstr ""
 
-#: templates/misago/threadslist/base.html:68
-#: templates/misago/threadslist/private_threads.html:70
+#: templates/misago/threadslist/base.html:67
+#: templates/misago/threadslist/private_threads.html:64
 msgid "No threads matching specified criteria were found."
 msgstr ""
 
-#: templates/misago/threadslist/base.html:83
+#: templates/misago/threadslist/base.html:82
 msgid "Next page"
 msgstr ""
 
-#: templates/misago/threadslist/private_threads.html:48
+#: templates/misago/threadslist/private_threads.html:42
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
 msgstr ""
 
-#: templates/misago/threadslist/private_threads.html:64
+#: templates/misago/threadslist/private_threads.html:58
 msgid "You aren't participating in any private threads."
 msgstr ""
 
@@ -4082,7 +4161,7 @@ msgstr ""
 
 #: templates/misago/userslists/active_posters.html:5
 #: templates/misago/userslists/active_posters.html:23
-#: templates/misago/userslists/active_posters.html:24 users/apps.py:73
+#: templates/misago/userslists/active_posters.html:24 users/apps.py:81
 msgid "Top posters"
 msgstr ""
 
@@ -5218,7 +5297,7 @@ msgid "Can add everyone to threads"
 msgstr ""
 
 #: threads/permissions/privatethreads.py:46
-msgid "Allows user to add users that are blocking him to private threads."
+msgid "Allows user to add users that are blocking them to private threads."
 msgstr ""
 
 #: threads/permissions/privatethreads.py:50
@@ -6947,21 +7026,26 @@ msgstr ""
 msgid "User \"%(user)s\" has been edited."
 msgstr ""
 
-#: users/api/auth.py:94
+#: users/api/auth.py:42 users/api/auth.py:92 users/api/auth.py:130
+#: users/api/auth.py:174
+msgid "Please use the 3rd party site to authenticate."
+msgstr ""
+
+#: users/api/auth.py:100
 #, python-format
 msgid "Activate %(user)s account on %(forum_name)s forums"
 msgstr ""
 
-#: users/api/auth.py:129
+#: users/api/auth.py:138
 #, python-format
 msgid "Change %(user)s password on %(forum_name)s forums"
 msgstr ""
 
-#: users/api/auth.py:164
+#: users/api/auth.py:176
 msgid "Form link is invalid. Please try again."
 msgstr ""
 
-#: users/api/auth.py:165
+#: users/api/auth.py:177
 msgid "Your link has expired. Please request new one."
 msgstr ""
 
@@ -7064,63 +7148,83 @@ msgstr ""
 msgid "You have to sign in to perform this action."
 msgstr ""
 
-#: users/api/users.py:109
+#: users/api/users.py:89
+msgid "Please use the 3rd party site to register."
+msgstr ""
+
+#: users/api/users.py:112
 msgid "You can't change other users avatars."
 msgstr ""
 
-#: users/api/users.py:121
+#: users/api/users.py:124
 msgid "You can't change other users options."
 msgstr ""
 
-#: users/api/users.py:126
+#: users/api/users.py:129
 msgid "Your forum options have been changed."
 msgstr ""
 
-#: users/api/users.py:132
+#: users/api/users.py:136
+msgid "Please use the 3rd party site to change your username."
+msgstr ""
+
+#: users/api/users.py:140
 msgid "You can't change other users names."
 msgstr ""
 
-#: users/api/users.py:139
+#: users/api/users.py:147
 msgid "You can't change other users signatures."
 msgstr ""
 
-#: users/api/users.py:151
+#: users/api/users.py:160
+msgid "Please use the 3rd party site to change your password."
+msgstr ""
+
+#: users/api/users.py:164
 msgid "You can't change other users passwords."
 msgstr ""
 
-#: users/api/users.py:161
+#: users/api/users.py:174
+msgid "Please use the 3rd party site to change your e-mail."
+msgstr ""
+
+#: users/api/users.py:179
 msgid "You can't change other users e-mail addresses."
 msgstr ""
 
-#: users/api/users.py:268
+#: users/api/users.py:210
+msgid "Please use the 3rd party site to delete account."
+msgstr ""
+
+#: users/api/users.py:291
 msgid "You can't request data downloads for other users."
 msgstr ""
 
-#: users/api/users.py:272
+#: users/api/users.py:295
 msgid "You can't download your data."
 msgstr ""
 
-#: users/api/users.py:277
+#: users/api/users.py:300
 msgid "You can't have more than one data download request at a single time."
 msgstr ""
 
-#: users/api/users.py:333
+#: users/api/users.py:356
 msgid "You can't see other users data downloads."
 msgstr ""
 
-#: users/apps.py:30
+#: users/apps.py:33
 msgid "Edit details"
 msgstr ""
 
-#: users/apps.py:36
+#: users/apps.py:39
 msgid "Change username"
 msgstr ""
 
-#: users/apps.py:42
+#: users/apps.py:46
 msgid "Change email or password"
 msgstr ""
 
-#: users/apps.py:63
+#: users/apps.py:71
 msgid "Delete account"
 msgstr ""
 
@@ -7199,7 +7303,7 @@ msgstr ""
 msgid "No user with this e-mail exists."
 msgstr ""
 
-#: users/forms/auth.py:150 users/views/activation.py:45
+#: users/forms/auth.py:150 users/views/activation.py:51
 #, python-format
 msgid "%(user)s, your account is already active."
 msgstr ""
@@ -7225,10 +7329,6 @@ msgstr ""
 msgid "This usernane is not allowed."
 msgstr ""
 
-#: users/forms/register.py:45 users/validators.py:51
-msgid "This e-mail address is not allowed."
-msgstr ""
-
 #: users/forms/register.py:51
 msgid "This agreement is required."
 msgstr ""
@@ -7717,10 +7817,6 @@ msgstr ""
 msgid "This username is not available."
 msgstr ""
 
-#: users/validators.py:79
-msgid "This username is not allowed."
-msgstr ""
-
 #: users/validators.py:85
 msgid "Username can only contain latin alphabet letters and digits."
 msgstr ""
@@ -7747,34 +7843,46 @@ msgstr ""
 msgid "This email is not allowed."
 msgstr ""
 
-#: users/views/activation.py:50
+#: users/views/activation.py:21
+msgid "Please use the 3rd party site to activate your account."
+msgstr ""
+
+#: users/views/activation.py:56
 #, python-format
 msgid ""
 "%(user)s, your activation link is invalid. Try again or request new "
 "activation link."
 msgstr ""
 
-#: users/views/activation.py:68
+#: users/views/activation.py:74
 #, python-format
 msgid "%(user)s, your account has been activated!"
 msgstr ""
 
-#: users/views/forgottenpassword.py:39
+#: users/views/forgottenpassword.py:18 users/views/options.py:70
+msgid "Please use the 3rd party site to change password."
+msgstr ""
+
+#: users/views/forgottenpassword.py:45
 #, python-format
 msgid "%(user)s, your link has expired. Please request new link and try again."
 msgstr ""
 
-#: users/views/forgottenpassword.py:46
+#: users/views/forgottenpassword.py:52
 #, python-format
 msgid "%(user)s, your link is invalid. Please try again or request new link."
 msgstr ""
 
-#: users/views/options.py:55
+#: users/views/options.py:47
+msgid "Please use the 3rd party site to change e-mail."
+msgstr ""
+
+#: users/views/options.py:59
 #, python-format
 msgid "%(user)s, your e-mail has been changed."
 msgstr ""
 
-#: users/views/options.py:73
+#: users/views/options.py:80
 #, python-format
 msgid "%(user)s, your password has been changed."
 msgstr ""

BIN
misago/locale/en/LC_MESSAGES/djangojs.mo


+ 33 - 28
misago/locale/en/LC_MESSAGES/djangojs.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-13 14:07+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,7 +100,7 @@ msgstr ""
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:13
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:17
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid "Cancel"
 msgstr ""
 
@@ -280,6 +280,10 @@ msgid "Edit details"
 msgstr ""
 
 #: static/misago/js/misago.js:2
+msgid "Insert spoiler"
+msgstr ""
+
+#: static/misago/js/misago.js:2
 msgid "Enter name of syntax of your code (optional)"
 msgstr ""
 
@@ -287,7 +291,7 @@ msgstr ""
 msgid "Insert code"
 msgstr ""
 
-#: static/misago/js/misago.js:2
+#: static/misago/js/misago.js:3
 msgid "Emphase selection"
 msgstr ""
 
@@ -396,7 +400,7 @@ msgstr ""
 msgid "(success)"
 msgstr ""
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:10
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:11
 #: static/misago/js/misago.js:17
 msgid "Best answer"
 msgstr ""
@@ -448,7 +452,8 @@ msgstr ""
 msgid "%(title)s, joined on %(joined_on)s"
 msgstr ""
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:13
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
+#: static/misago/js/misago.js:13
 msgid "Change username"
 msgstr ""
 
@@ -485,12 +490,11 @@ msgstr ""
 msgid "New username"
 msgstr ""
 
-#: static/misago/js/misago.js:4
+#: static/misago/js/misago.js:5
 msgid "Your username has been changed successfully."
 msgstr ""
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change your options"
 msgstr ""
 
@@ -886,11 +890,11 @@ msgstr ""
 msgid "Posted by %(poster)s %(posted_on)s."
 msgstr ""
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "Voting ends %(ends_on)s."
 msgstr ""
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "%(votes)s vote."
 msgid_plural "%(votes)s votes."
 msgstr[0] ""
@@ -940,6 +944,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:7 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
+#: static/misago/js/misago.js:17
 msgid "Delete"
 msgstr ""
 
@@ -977,11 +982,11 @@ msgstr ""
 msgid "See results"
 msgstr ""
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert post to state from before this edit."
 msgstr ""
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert"
 msgstr ""
 
@@ -998,7 +1003,7 @@ msgstr ""
 msgid "Post has been reverted to previous state."
 msgstr ""
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "See previous change"
 msgstr ""
 
@@ -1099,7 +1104,7 @@ msgstr ""
 msgid "Post thread"
 msgstr ""
 
-#: static/misago/js/misago.js:8
+#: static/misago/js/misago.js:9
 msgid "Are you sure you want to discard thread?"
 msgstr ""
 
@@ -1178,7 +1183,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:10
-#: static/misago/js/misago.js:16
+#: static/misago/js/misago.js:16 static/misago/js/misago.js:17
 msgid "Hide"
 msgstr ""
 
@@ -1284,12 +1289,12 @@ msgstr ""
 msgid "This post is hidden. You cannot see its contents."
 msgstr ""
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid ""
 "Are you sure you want to delete this post? This action is not reversible!"
 msgstr ""
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid "Post has been deleted."
 msgstr ""
 
@@ -1817,7 +1822,8 @@ msgstr ""
 msgid "Registration is currently unavailable due to an error."
 msgstr ""
 
-#: static/misago/js/misago.js:13 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:13 static/misago/js/misago.js:14
+#: static/misago/js/misago.js:20
 msgid "Register"
 msgstr ""
 
@@ -2043,7 +2049,7 @@ msgid ""
 "Are you sure you want to merge selected posts? This action is not reversible!"
 msgstr ""
 
-#: static/misago/js/misago.js:15
+#: static/misago/js/misago.js:16
 msgid ""
 "Are you sure you want to delete selected posts? This action is not "
 "reversible!"
@@ -2370,13 +2376,13 @@ msgstr ""
 msgid "One or more threads could not be deleted:"
 msgstr ""
 
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid ""
 "You can't move threads because there are no categories you are allowed to "
 "move them to."
 msgstr ""
 
-#: static/misago/js/misago.js:19
+#: static/misago/js/misago.js:20
 msgid ""
 "You need permission to start threads in category to be able to merge threads "
 "to it."
@@ -2448,16 +2454,15 @@ msgstr ""
 msgid "Sign in or register to start and participate in discussions."
 msgstr ""
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "You have unread private threads!"
 msgstr ""
 
-#: static/misago/js/misago.js:20 static/misago/js/misago.js:21
-#: static/misago/js/misago.js:23
+#: static/misago/js/misago.js:21 static/misago/js/misago.js:23
 msgid "Private threads"
 msgstr ""
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "Are you sure you want to sign out?"
 msgstr ""
 
@@ -2535,11 +2540,11 @@ msgstr[1] ""
 msgid "No users have posted any new messages during last %(days)s days."
 msgstr ""
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Rank"
 msgstr ""
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Ranked posts"
 msgstr ""
 
@@ -2629,7 +2634,7 @@ msgstr ""
 msgid "You are already working on a poll. Do you want to discard it?"
 msgstr ""
 
-#: static/misago/js/misago.js:24
+#: static/misago/js/misago.js:25
 msgid "You don't have permission to perform this action."
 msgstr ""
 

BIN
misago/locale/es/LC_MESSAGES/django.mo


+ 202 - 96
misago/locale/es/LC_MESSAGES/django.po

@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-07 17:33+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: Rafał Pitoń <kontakt@rpiton.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/misago/teams/65369/es/)\n"
@@ -216,22 +216,21 @@ msgstr ""
 "Solo los miembros con permisos válidos pueden publicar en categorías "
 "cerradas."
 
-#: categories/admin/forms.py:70 conf/admin/__init__.py:79
+#: categories/admin/forms.py:70 conf/admin/__init__.py:93
 #: templates/misago/admin/categories/list.html:19
 #: templates/misago/admin/dashboard/totals.html:19
 #: templates/misago/navbar.html:20 templates/misago/navbar.html:36
 #: templates/misago/profile/threads.html:5
 #: templates/misago/profile/threads.html:8
 #: templates/misago/profile/threads.html:9
-#: templates/misago/threadslist/category.html:74
+#: templates/misago/threadslist/category.html:68
 #: templates/misago/threadslist/threads.html:14
 #: templates/misago/threadslist/threads.html:16
-#: templates/misago/threadslist/threads.html:18
-#: templates/misago/threadslist/threads.html:35
-#: templates/misago/threadslist/threads.html:44
-#: templates/misago/threadslist/threads.html:63
+#: templates/misago/threadslist/threads.html:33
+#: templates/misago/threadslist/threads.html:42
+#: templates/misago/threadslist/threads.html:66
 #: threads/permissions/threads.py:73 threads/permissions/threads.py:104
-#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:98
+#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:106
 msgid "Threads"
 msgstr "Hilos"
 
@@ -467,20 +466,20 @@ msgstr "Puedes ver los contenidos de la categoría"
 msgid "You don't have permission to browse \"%(category)s\" contents."
 msgstr "No tienes permiso para explorar \"%(category)s\" contenidos."
 
-#: conf/admin/__init__.py:41 templates/misago/admin/conf/index.html:5
+#: conf/admin/__init__.py:45 templates/misago/admin/conf/index.html:5
 #: templates/misago/admin/themes/form.html:48
 msgid "Settings"
 msgstr "Ajustes"
 
-#: conf/admin/__init__.py:48 templates/misago/admin/socialauth/form.html:27
+#: conf/admin/__init__.py:52 templates/misago/admin/socialauth/form.html:27
 msgid "General"
 msgstr "General"
 
-#: conf/admin/__init__.py:49
+#: conf/admin/__init__.py:53
 msgid "Change forum details like name, description or footer."
 msgstr ""
 
-#: conf/admin/__init__.py:54 templates/misago/admin/dashboard/totals.html:7
+#: conf/admin/__init__.py:58 templates/misago/admin/dashboard/totals.html:7
 #: templates/misago/admin/users/ban.html:22 templates/misago/navbar.html:42
 #: templates/misago/userslists/base.html:5
 #: templates/misago/userslists/base.html:14 users/admin/__init__.py:74
@@ -488,28 +487,38 @@ msgstr ""
 msgid "Users"
 msgstr "Usuarios"
 
-#: conf/admin/__init__.py:56
+#: conf/admin/__init__.py:60
 msgid "Customize user accounts default behavior and features availability."
 msgstr ""
 
-#: conf/admin/__init__.py:63
+#: conf/admin/__init__.py:67
 msgid "Captcha"
 msgstr ""
 
-#: conf/admin/__init__.py:65
+#: conf/admin/__init__.py:69
 msgid "Setup protection against automatic registrations on the site."
 msgstr ""
 
-#: conf/admin/__init__.py:72 templates/misago/admin/dashboard/analytics.html:7
+#: conf/admin/__init__.py:76
+msgid "Single Sign-On"
+msgstr ""
+
+#: conf/admin/__init__.py:78
+msgid ""
+"SSO enables you to delegate user login and registration from Misago tothe "
+"third party site."
+msgstr ""
+
+#: conf/admin/__init__.py:86 templates/misago/admin/dashboard/analytics.html:7
 #: templates/misago/admin/dashboard/index.html:40
 msgid "Analytics"
 msgstr ""
 
-#: conf/admin/__init__.py:73
+#: conf/admin/__init__.py:87
 msgid "Enable Google Analytics or setup Google Site Verification."
 msgstr ""
 
-#: conf/admin/__init__.py:80
+#: conf/admin/__init__.py:94
 msgid "Threads, posts, polls and attachments options."
 msgstr ""
 
@@ -748,6 +757,39 @@ msgid ""
 "Address under which site is running appears to be \"%(address)s\"."
 msgstr ""
 
+#: conf/admin/forms/sso.py:13
+msgid "Enable Single Sign-On"
+msgstr ""
+
+#: conf/admin/forms/sso.py:15
+msgid ""
+"Enabling SSO will make login option redirect users to the server URL "
+"configured below. It will also disable option to register on forum, change "
+"username, email or passward, as those features will be delegated to the 3rd "
+"party site."
+msgstr ""
+
+#: conf/admin/forms/sso.py:22
+msgid "Public key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:24 conf/admin/forms/sso.py:32
+msgid ""
+"Leave this field empty for Misago to generate this key on form submission."
+msgstr ""
+
+#: conf/admin/forms/sso.py:30
+msgid "Private key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:37
+msgid "Server URL"
+msgstr ""
+
+#: conf/admin/forms/sso.py:50
+msgid "You need to enter server URL to enable SSO."
+msgstr ""
+
 #: conf/admin/forms/threads.py:27
 msgid "Daily post limit per user"
 msgstr ""
@@ -1060,7 +1102,7 @@ msgstr ""
 msgid "This value must be lower than number of users per page."
 msgstr ""
 
-#: conf/admin/views.py:39
+#: conf/admin/views.py:40
 msgid "Settings have been saved."
 msgstr ""
 
@@ -1110,11 +1152,6 @@ msgstr "Esta acción no está disponible para los invitados."
 #: core/templatetags/misago_pagetitle.py:10
 #: templates/misago/thread/private_thread.html:7
 #: templates/misago/thread/thread.html:7
-#: templates/misago/threadslist/category.html:8
-#: templates/misago/threadslist/category.html:13
-#: templates/misago/threadslist/private_threads.html:8
-#: templates/misago/threadslist/private_threads.html:13
-#: templates/misago/threadslist/threads.html:16
 #, python-format
 msgid "page: %(page)s"
 msgstr "página: %(page)s"
@@ -1342,15 +1379,28 @@ msgstr "Términos del servicio"
 msgid "Privacy policy"
 msgstr "Política de privacidad"
 
-#: markup/finalise.py:20
+#: markup/finalize.py:24
 #, python-format
 msgid "%(title)s has written:"
 msgstr "%(title)s ha escrito:"
 
-#: markup/finalise.py:22
+#: markup/finalize.py:26
 msgid "Quoted message:"
 msgstr "Mensaje citado:"
 
+#: markup/finalize.py:33
+#, python-format
+msgid "%(title)s:"
+msgstr ""
+
+#: markup/finalize.py:35
+msgid "Spoiler:"
+msgstr ""
+
+#: markup/finalize.py:40
+msgid "Reveal spoiler"
+msgstr ""
+
 #: search/api.py:17 search/views.py:12 search/views.py:21
 msgid "You don't have permission to search site."
 msgstr "No tienes permiso para buscar en el sitio."
@@ -1467,6 +1517,18 @@ msgstr ""
 msgid "Please try resubmitting the form."
 msgstr "Intenta volver a enviar el formulario."
 
+#: socialauth/views.py:23
+msgid "Please use the 3rd party site to login."
+msgstr ""
+
+#: sso/validators.py:24 users/validators.py:79
+msgid "This username is not allowed."
+msgstr "Este nombre de usuario no está permitido."
+
+#: sso/validators.py:33 users/forms/register.py:45 users/validators.py:51
+msgid "This e-mail address is not allowed."
+msgstr "Esta dirección de correo electrónico no está permitida."
+
 #: templates/misago/acl_debug.html:5
 #, python-format
 msgid ""
@@ -1897,7 +1959,7 @@ msgstr "Categoría"
 #: templates/misago/admin/dashboard/totals.html:31
 #: templates/misago/admin/users/list.html:21
 #: templates/misago/profile/posts.html:5 templates/misago/profile/posts.html:8
-#: templates/misago/profile/posts.html:9 users/apps.py:94
+#: templates/misago/profile/posts.html:9 users/apps.py:102
 msgid "Posts"
 msgstr "Mensajes"
 
@@ -2039,45 +2101,56 @@ msgstr ""
 msgid "Attachment error images"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:8
+#: templates/misago/admin/conf/users_settings.html:9
+#: templates/misago/admin/socialauth/list.html:97
+msgid "Note"
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:9
+msgid ""
+"Single Sign-On is enabled. Site's registration, password and deletion "
+"features have been disabled and delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:14
 msgid "New accounts"
 msgstr "Nuevas cuentas"
 
-#: templates/misago/admin/conf/users_settings.html:17 users/admin/forms.py:484
+#: templates/misago/admin/conf/users_settings.html:23 users/admin/forms.py:484
 #: users/admin/forms.py:573
 msgid "Usernames"
 msgstr "Nombres de Usuario"
 
-#: templates/misago/admin/conf/users_settings.html:27
+#: templates/misago/admin/conf/users_settings.html:33
 msgid "Avatars"
 msgstr "Avatares"
 
-#: templates/misago/admin/conf/users_settings.html:43
+#: templates/misago/admin/conf/users_settings.html:49
 msgid "Signatures"
 msgstr "Firmas"
 
-#: templates/misago/admin/conf/users_settings.html:51
+#: templates/misago/admin/conf/users_settings.html:57
 #: users/admin/__init__.py:80
 msgid "Data downloads"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:60
+#: templates/misago/admin/conf/users_settings.html:66
 msgid "Own account deletion"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:68 users/admin/forms.py:492
+#: templates/misago/admin/conf/users_settings.html:74 users/admin/forms.py:492
 msgid "IP addresses"
 msgstr "Dirección(es) IP "
 
-#: templates/misago/admin/conf/users_settings.html:76
+#: templates/misago/admin/conf/users_settings.html:82
 msgid "Default subscription preferences"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:85
+#: templates/misago/admin/conf/users_settings.html:91
 msgid "Users lists"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:94
+#: templates/misago/admin/conf/users_settings.html:100
 msgid "Top posters ranking"
 msgstr ""
 
@@ -2599,7 +2672,7 @@ msgid "Enabled login methods"
 msgstr ""
 
 #: templates/misago/admin/socialauth/list.html:15
-#: templates/misago/admin/socialauth/list.html:106
+#: templates/misago/admin/socialauth/list.html:112
 msgid "Provider"
 msgstr ""
 
@@ -2615,19 +2688,25 @@ msgstr ""
 msgid "Are you sure you want to disable this social login provider?"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:100
+#: templates/misago/admin/socialauth/list.html:97
+msgid ""
+"Single Sign-On is enabled. Social authentication has been disabled and "
+"delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/socialauth/list.html:106
 msgid "Setup new login method"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:119
+#: templates/misago/admin/socialauth/list.html:125
 msgid "Setup login with this provider"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:120
+#: templates/misago/admin/socialauth/list.html:126
 msgid "Setup"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:127
+#: templates/misago/admin/socialauth/list.html:133
 msgid "No new login providers are available for setup at this time."
 msgstr ""
 
@@ -2926,7 +3005,7 @@ msgstr ""
 msgid "Signature"
 msgstr "Firma"
 
-#: templates/misago/admin/users/edit.html:228 users/apps.py:24
+#: templates/misago/admin/users/edit.html:228 users/apps.py:27
 msgid "Forum options"
 msgstr "Opciones de foro"
 
@@ -3191,7 +3270,7 @@ msgid ""
 "download."
 msgstr ""
 
-#: templates/misago/emails/data_download.html:11 users/apps.py:52
+#: templates/misago/emails/data_download.html:11 users/apps.py:57
 msgid "Download data"
 msgstr ""
 
@@ -3603,7 +3682,7 @@ msgstr "Ver resultados"
 #: templates/misago/profile/ban_details.html:5
 #: templates/misago/profile/ban_details.html:8
 #: templates/misago/profile/ban_details.html:9
-#: templates/misago/profile/ban_details.html:16 users/apps.py:129
+#: templates/misago/profile/ban_details.html:16 users/apps.py:137
 msgid "Ban details"
 msgstr "Detalles del baneo"
 
@@ -3652,7 +3731,7 @@ msgstr[1] "Empezó %(threads)s hilos."
 #: templates/misago/profile/details.html:5
 #: templates/misago/profile/details.html:8
 #: templates/misago/profile/details.html:9
-#: templates/misago/profile/details.html:19 users/apps.py:116
+#: templates/misago/profile/details.html:19 users/apps.py:124
 msgid "Details"
 msgstr "Detalles"
 
@@ -3683,7 +3762,7 @@ msgstr ""
 
 #: templates/misago/profile/followers.html:5
 #: templates/misago/profile/followers.html:8
-#: templates/misago/profile/followers.html:9 users/apps.py:104
+#: templates/misago/profile/followers.html:9 users/apps.py:112
 msgid "Followers"
 msgstr "Seguidores"
 
@@ -3712,7 +3791,7 @@ msgstr "%(username)s no tiene seguidores."
 
 #: templates/misago/profile/follows.html:5
 #: templates/misago/profile/follows.html:8
-#: templates/misago/profile/follows.html:9 users/apps.py:110
+#: templates/misago/profile/follows.html:9 users/apps.py:118
 msgid "Follows"
 msgstr "Seguidos"
 
@@ -3800,7 +3879,7 @@ msgstr "%(username)s no ha iniciado ningún hilo."
 
 #: templates/misago/profile/username_history.html:5
 #: templates/misago/profile/username_history.html:8
-#: templates/misago/profile/username_history.html:9 users/apps.py:122
+#: templates/misago/profile/username_history.html:9 users/apps.py:130
 msgid "Username history"
 msgstr "Historial de nombres de usuario"
 
@@ -4115,29 +4194,29 @@ msgstr ""
 msgid "Best answer"
 msgstr ""
 
-#: templates/misago/threadslist/base.html:58
+#: templates/misago/threadslist/base.html:57
 msgid "There are no threads in this category."
 msgstr "No existen hilos en esta categoría... ¡todavía!"
 
-#: templates/misago/threadslist/base.html:60
+#: templates/misago/threadslist/base.html:59
 msgid "There are no threads on this forum... yet!"
 msgstr "No existen hilos en este foro... ¡todavía!"
 
-#: templates/misago/threadslist/base.html:64
-#: templates/misago/threadslist/private_threads.html:67
+#: templates/misago/threadslist/base.html:63
+#: templates/misago/threadslist/private_threads.html:61
 msgid "Why not start one yourself?"
 msgstr "¿Por qué no creas uno tú mismo?"
 
-#: templates/misago/threadslist/base.html:68
-#: templates/misago/threadslist/private_threads.html:70
+#: templates/misago/threadslist/base.html:67
+#: templates/misago/threadslist/private_threads.html:64
 msgid "No threads matching specified criteria were found."
 msgstr "No existen hilos que correspondan a tu criterio de búsqueda."
 
-#: templates/misago/threadslist/base.html:83
+#: templates/misago/threadslist/base.html:82
 msgid "Next page"
 msgstr "Siguiente página"
 
-#: templates/misago/threadslist/private_threads.html:48
+#: templates/misago/threadslist/private_threads.html:42
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
@@ -4145,7 +4224,7 @@ msgstr ""
 "Los hilos privados son hilos en los que puedes hablar con los participantes "
 "que tú elijas, ellos serán los únicos que podrán leer y escribir."
 
-#: templates/misago/threadslist/private_threads.html:64
+#: templates/misago/threadslist/private_threads.html:58
 msgid "You aren't participating in any private threads."
 msgstr "No participas en ningún hilo privado."
 
@@ -4179,7 +4258,7 @@ msgstr "Encuesta"
 
 #: templates/misago/userslists/active_posters.html:5
 #: templates/misago/userslists/active_posters.html:23
-#: templates/misago/userslists/active_posters.html:24 users/apps.py:73
+#: templates/misago/userslists/active_posters.html:24 users/apps.py:81
 msgid "Top posters"
 msgstr ""
 
@@ -5356,10 +5435,8 @@ msgid "Can add everyone to threads"
 msgstr "Puede agregar a todos a los hilos"
 
 #: threads/permissions/privatethreads.py:46
-msgid "Allows user to add users that are blocking him to private threads."
+msgid "Allows user to add users that are blocking them to private threads."
 msgstr ""
-"Permite al usuario agregar usuarios que lo están bloqueando a hilos "
-"privados."
 
 #: threads/permissions/privatethreads.py:50
 msgid "Can report private threads"
@@ -7206,21 +7283,26 @@ msgstr "Nuevo usuario \"%(user)s\" ha sido registrado."
 msgid "User \"%(user)s\" has been edited."
 msgstr "Usuario \"%(user)s\" ha sido editado."
 
-#: users/api/auth.py:94
+#: users/api/auth.py:42 users/api/auth.py:92 users/api/auth.py:130
+#: users/api/auth.py:174
+msgid "Please use the 3rd party site to authenticate."
+msgstr ""
+
+#: users/api/auth.py:100
 #, python-format
 msgid "Activate %(user)s account on %(forum_name)s forums"
 msgstr "Activa la cuenta %(user)s de %(forum_name)s"
 
-#: users/api/auth.py:129
+#: users/api/auth.py:138
 #, python-format
 msgid "Change %(user)s password on %(forum_name)s forums"
 msgstr "Cambiar la contraseña de %(user)s en %(forum_name)s"
 
-#: users/api/auth.py:164
+#: users/api/auth.py:176
 msgid "Form link is invalid. Please try again."
 msgstr "El enlace del formulario no es válido. Por favor inténtalo de nuevo"
 
-#: users/api/auth.py:165
+#: users/api/auth.py:177
 msgid "Your link has expired. Please request new one."
 msgstr "Tu enlace ha expirado Por favor, solicita uno nuevo."
 
@@ -7327,64 +7409,84 @@ msgstr "No tienes permiso para ver el historial de nombres de otros usuarios."
 msgid "You have to sign in to perform this action."
 msgstr "Debes iniciar sesión para realizar esta acción."
 
-#: users/api/users.py:109
+#: users/api/users.py:89
+msgid "Please use the 3rd party site to register."
+msgstr ""
+
+#: users/api/users.py:112
 msgid "You can't change other users avatars."
 msgstr "No puedes cambiar avatares de otros usuarios."
 
-#: users/api/users.py:121
+#: users/api/users.py:124
 msgid "You can't change other users options."
 msgstr "No puede cambiar opciones de otros usuarios."
 
-#: users/api/users.py:126
+#: users/api/users.py:129
 msgid "Your forum options have been changed."
 msgstr "Tus opciones de foro han sido cambiadas."
 
-#: users/api/users.py:132
+#: users/api/users.py:136
+msgid "Please use the 3rd party site to change your username."
+msgstr ""
+
+#: users/api/users.py:140
 msgid "You can't change other users names."
 msgstr "No puedes cambiar otros nombres de usuarios."
 
-#: users/api/users.py:139
+#: users/api/users.py:147
 msgid "You can't change other users signatures."
 msgstr "No puedes cambiar las firmas de otros usuarios."
 
-#: users/api/users.py:151
+#: users/api/users.py:160
+msgid "Please use the 3rd party site to change your password."
+msgstr ""
+
+#: users/api/users.py:164
 msgid "You can't change other users passwords."
 msgstr "No puedes cambiar las contraseñas de otros usuarios."
 
-#: users/api/users.py:161
+#: users/api/users.py:174
+msgid "Please use the 3rd party site to change your e-mail."
+msgstr ""
+
+#: users/api/users.py:179
 msgid "You can't change other users e-mail addresses."
 msgstr ""
 "No puedes cambiar las direcciones de correo electrónico de otros usuarios."
 
-#: users/api/users.py:268
+#: users/api/users.py:210
+msgid "Please use the 3rd party site to delete account."
+msgstr ""
+
+#: users/api/users.py:291
 msgid "You can't request data downloads for other users."
 msgstr ""
 
-#: users/api/users.py:272
+#: users/api/users.py:295
 msgid "You can't download your data."
 msgstr ""
 
-#: users/api/users.py:277
+#: users/api/users.py:300
 msgid "You can't have more than one data download request at a single time."
 msgstr ""
 
-#: users/api/users.py:333
+#: users/api/users.py:356
 msgid "You can't see other users data downloads."
 msgstr ""
 
-#: users/apps.py:30
+#: users/apps.py:33
 msgid "Edit details"
 msgstr "Editar detalles"
 
-#: users/apps.py:36
+#: users/apps.py:39
 msgid "Change username"
 msgstr "Cambiar nombre de usuario"
 
-#: users/apps.py:42
+#: users/apps.py:46
 msgid "Change email or password"
 msgstr "Cambiar e-mail o contraseña"
 
-#: users/apps.py:63
+#: users/apps.py:71
 msgid "Delete account"
 msgstr ""
 
@@ -7464,7 +7566,7 @@ msgstr "El correo electrónico ingresado no es válido."
 msgid "No user with this e-mail exists."
 msgstr "No existen usuarios con este correo electrónico."
 
-#: users/forms/auth.py:150 users/views/activation.py:45
+#: users/forms/auth.py:150 users/views/activation.py:51
 #, python-format
 msgid "%(user)s, your account is already active."
 msgstr "%(user)s, tu cuenta ya está activa."
@@ -7493,10 +7595,6 @@ msgstr ""
 msgid "This usernane is not allowed."
 msgstr "Este usuario no está permitido."
 
-#: users/forms/register.py:45 users/validators.py:51
-msgid "This e-mail address is not allowed."
-msgstr "Esta dirección de correo electrónico no está permitida."
-
 #: users/forms/register.py:51
 msgid "This agreement is required."
 msgstr ""
@@ -8012,10 +8110,6 @@ msgstr "Esta dirección de correo electrónico no está disponible."
 msgid "This username is not available."
 msgstr "Este nombre de usuario no está disponible"
 
-#: users/validators.py:79
-msgid "This username is not allowed."
-msgstr "Este nombre de usuario no está permitido."
-
 #: users/validators.py:85
 msgid "Username can only contain latin alphabet letters and digits."
 msgstr ""
@@ -8048,7 +8142,11 @@ msgstr ""
 msgid "This email is not allowed."
 msgstr "Este correo electrónico no está permitido."
 
-#: users/views/activation.py:50
+#: users/views/activation.py:21
+msgid "Please use the 3rd party site to activate your account."
+msgstr ""
+
+#: users/views/activation.py:56
 #, python-format
 msgid ""
 "%(user)s, your activation link is invalid. Try again or request new "
@@ -8057,12 +8155,16 @@ msgstr ""
 "%(user)s, su enlace de activación no es válido. Inténtalo de nuevo o "
 "solicita un nuevo enlace de activación."
 
-#: users/views/activation.py:68
+#: users/views/activation.py:74
 #, python-format
 msgid "%(user)s, your account has been activated!"
 msgstr "%(user)s, ¡tu cuenta ha sido activada!"
 
-#: users/views/forgottenpassword.py:39
+#: users/views/forgottenpassword.py:18 users/views/options.py:70
+msgid "Please use the 3rd party site to change password."
+msgstr ""
+
+#: users/views/forgottenpassword.py:45
 #, python-format
 msgid ""
 "%(user)s, your link has expired. Please request new link and try again."
@@ -8070,19 +8172,23 @@ msgstr ""
 "%(user)s, tu enlace ha expirado. Solicita un nuevo enlace y vuelve a "
 "intentarlo."
 
-#: users/views/forgottenpassword.py:46
+#: users/views/forgottenpassword.py:52
 #, python-format
 msgid "%(user)s, your link is invalid. Please try again or request new link."
 msgstr ""
 "%(user)s, tu enlace no es válido. Por favor inténtalo de nuevo o solicita un"
 " nuevo enlace."
 
-#: users/views/options.py:55
+#: users/views/options.py:47
+msgid "Please use the 3rd party site to change e-mail."
+msgstr ""
+
+#: users/views/options.py:59
 #, python-format
 msgid "%(user)s, your e-mail has been changed."
 msgstr "%(user)s, tu correo electrónico ha sido cambiado."
 
-#: users/views/options.py:73
+#: users/views/options.py:80
 #, python-format
 msgid "%(user)s, your password has been changed."
 msgstr "%(user)s, tu contraseña ha sido modificada."

BIN
misago/locale/es/LC_MESSAGES/djangojs.mo


+ 33 - 28
misago/locale/es/LC_MESSAGES/djangojs.po

@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-06 13:05+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: Javier Lorenzo <javichio@gmail.com>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/misago/teams/65369/es/)\n"
@@ -103,7 +103,7 @@ msgstr "Usuario a añadir"
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:13
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:17
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -288,6 +288,10 @@ msgid "Edit details"
 msgstr "Editar detalles"
 
 #: static/misago/js/misago.js:2
+msgid "Insert spoiler"
+msgstr ""
+
+#: static/misago/js/misago.js:2
 msgid "Enter name of syntax of your code (optional)"
 msgstr "Introduce el nombre de la sintaxis de tu código (opcional)"
 
@@ -295,7 +299,7 @@ msgstr "Introduce el nombre de la sintaxis de tu código (opcional)"
 msgid "Insert code"
 msgstr "Insertar código"
 
-#: static/misago/js/misago.js:2
+#: static/misago/js/misago.js:3
 msgid "Emphase selection"
 msgstr "Añadir énfasis a la selección"
 
@@ -404,7 +408,7 @@ msgstr "(error)"
 msgid "(success)"
 msgstr "(correcto)"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:10
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:11
 #: static/misago/js/misago.js:17
 msgid "Best answer"
 msgstr ""
@@ -458,7 +462,8 @@ msgstr "Escrito por %(poster)s en %(posted_on)s en %(category)s."
 msgid "%(title)s, joined on %(joined_on)s"
 msgstr "%(title)s, ha entrado en %(joined_on)s"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:13
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
+#: static/misago/js/misago.js:13
 msgid "Change username"
 msgstr "Cambiar nombre de usuario"
 
@@ -498,12 +503,11 @@ msgstr "El nombre propuesto es igual al anterior."
 msgid "New username"
 msgstr "Nuevo nombre de usuario"
 
-#: static/misago/js/misago.js:4
+#: static/misago/js/misago.js:5
 msgid "Your username has been changed successfully."
 msgstr "Tu nombre de usuario se ha cambiado correctamente."
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change your options"
 msgstr "Cambia tus opciones"
 
@@ -908,11 +912,11 @@ msgstr "Publicar encuesta"
 msgid "Posted by %(poster)s %(posted_on)s."
 msgstr "Publicado por %(poster)s en %(posted_on)s."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "Voting ends %(ends_on)s."
 msgstr "La votación termina %(ends_on)s."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "%(votes)s vote."
 msgid_plural "%(votes)s votes."
 msgstr[0] "%(votes)s voto"
@@ -964,6 +968,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:7 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
+#: static/misago/js/misago.js:17
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -1001,11 +1006,11 @@ msgstr "Guardar tu voto"
 msgid "See results"
 msgstr "Ver resultados"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert post to state from before this edit."
 msgstr "Revertir el mensaje al estado anterior a la edición."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert"
 msgstr "Revertir"
 
@@ -1025,7 +1030,7 @@ msgstr ""
 msgid "Post has been reverted to previous state."
 msgstr "El mensaje ha sido revertido al estado anterior."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "See previous change"
 msgstr "Ver cambio anterior"
 
@@ -1128,7 +1133,7 @@ msgstr "Título del hilo"
 msgid "Post thread"
 msgstr "Publicar hilo"
 
-#: static/misago/js/misago.js:8
+#: static/misago/js/misago.js:9
 msgid "Are you sure you want to discard thread?"
 msgstr "¿Estás seguro de querer descartar el hilo?"
 
@@ -1223,7 +1228,7 @@ msgstr[1] ""
 " %(show_value)s)."
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:10
-#: static/misago/js/misago.js:16
+#: static/misago/js/misago.js:16 static/misago/js/misago.js:17
 msgid "Hide"
 msgstr "Ocultar"
 
@@ -1331,14 +1336,14 @@ msgstr "Oculto por %(hiden_by)s %(hidden_on)s."
 msgid "This post is hidden. You cannot see its contents."
 msgstr "El mensaje está oculto. No puedes ver su contenido."
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid ""
 "Are you sure you want to delete this post? This action is not reversible!"
 msgstr ""
 "¿Estás seguro de querer eliminar este mensaje? ¡Esta acción no puede "
 "deshacerse!"
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid "Post has been deleted."
 msgstr "El mensaje ha sido eliminado"
 
@@ -1881,7 +1886,8 @@ msgstr "Los registros están actualmente cerrados."
 msgid "Registration is currently unavailable due to an error."
 msgstr "Se han cerrado los registros debido a un error inesperado."
 
-#: static/misago/js/misago.js:13 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:13 static/misago/js/misago.js:14
+#: static/misago/js/misago.js:20
 msgid "Register"
 msgstr "Registro"
 
@@ -2118,7 +2124,7 @@ msgstr ""
 "¿Estás seguro de que quieres mezclar los mensajes seleccionados? Esta opción"
 " no puede deshacerse."
 
-#: static/misago/js/misago.js:15
+#: static/misago/js/misago.js:16
 msgid ""
 "Are you sure you want to delete selected posts? This action is not "
 "reversible!"
@@ -2449,14 +2455,14 @@ msgstr "Moderar hilos"
 msgid "One or more threads could not be deleted:"
 msgstr "Uno o más hilos no pueden ser eliminados:"
 
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid ""
 "You can't move threads because there are no categories you are allowed to "
 "move them to."
 msgstr ""
 "No pudes mover hilos porque no existen categorías a las que puedas moverlas"
 
-#: static/misago/js/misago.js:19
+#: static/misago/js/misago.js:20
 msgid ""
 "You need permission to start threads in category to be able to merge threads"
 " to it."
@@ -2532,16 +2538,15 @@ msgstr "Estás navegando como invitado."
 msgid "Sign in or register to start and participate in discussions."
 msgstr "Inicia sesión o registrate para comenzar a participar en los foros."
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "You have unread private threads!"
 msgstr ""
 
-#: static/misago/js/misago.js:20 static/misago/js/misago.js:21
-#: static/misago/js/misago.js:23
+#: static/misago/js/misago.js:21 static/misago/js/misago.js:23
 msgid "Private threads"
 msgstr "Hilos privados"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "Are you sure you want to sign out?"
 msgstr "¿Estás seguro de que quieres cerrar sesión?"
 
@@ -2619,11 +2624,11 @@ msgstr[1] "%(followers)s seguidores"
 msgid "No users have posted any new messages during last %(days)s days."
 msgstr "Los usuarios no han escrito en los últimos %(days)s days."
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Rank"
 msgstr "Rango"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Ranked posts"
 msgstr "Mensajes de rango"
 
@@ -2715,7 +2720,7 @@ msgstr "Estás escribiendo un mensaje, ¿quieres descartarlo?"
 msgid "You are already working on a poll. Do you want to discard it?"
 msgstr "Estás haciendo una encuesta, ¿quieres descartarla?"
 
-#: static/misago/js/misago.js:24
+#: static/misago/js/misago.js:25
 msgid "You don't have permission to perform this action."
 msgstr "No tienes permisos para realizar esta acción."
 

BIN
misago/locale/fr/LC_MESSAGES/django.mo


+ 217 - 108
misago/locale/fr/LC_MESSAGES/django.po

@@ -11,15 +11,16 @@
 # carine hejl <carinelg@yahoo.fr>, 2017
 # Olivier Cortès <olive@deep-ocean.net>, 2018
 # Palimpseste, 2018
+# Jimmy RUNDSTADLER, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-07 17:33+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
-"Last-Translator: Palimpseste, 2018\n"
+"Last-Translator: Jimmy RUNDSTADLER, 2019\n"
 "Language-Team: French (https://www.transifex.com/misago/teams/65369/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -219,22 +220,21 @@ msgstr "Catégorie fermée"
 msgid "Only members with valid permissions can post in closed categories."
 msgstr "Seul les membres autorisés peuvent écrire dans une catégorie close."
 
-#: categories/admin/forms.py:70 conf/admin/__init__.py:79
+#: categories/admin/forms.py:70 conf/admin/__init__.py:93
 #: templates/misago/admin/categories/list.html:19
 #: templates/misago/admin/dashboard/totals.html:19
 #: templates/misago/navbar.html:20 templates/misago/navbar.html:36
 #: templates/misago/profile/threads.html:5
 #: templates/misago/profile/threads.html:8
 #: templates/misago/profile/threads.html:9
-#: templates/misago/threadslist/category.html:74
+#: templates/misago/threadslist/category.html:68
 #: templates/misago/threadslist/threads.html:14
 #: templates/misago/threadslist/threads.html:16
-#: templates/misago/threadslist/threads.html:18
-#: templates/misago/threadslist/threads.html:35
-#: templates/misago/threadslist/threads.html:44
-#: templates/misago/threadslist/threads.html:63
+#: templates/misago/threadslist/threads.html:33
+#: templates/misago/threadslist/threads.html:42
+#: templates/misago/threadslist/threads.html:66
 #: threads/permissions/threads.py:73 threads/permissions/threads.py:104
-#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:98
+#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:106
 msgid "Threads"
 msgstr "Fils de discussion"
 
@@ -477,20 +477,20 @@ msgstr ""
 "Vous n'avez pas le permission de parcourir le contenu de la catégorie « "
 "%(category)s »."
 
-#: conf/admin/__init__.py:41 templates/misago/admin/conf/index.html:5
+#: conf/admin/__init__.py:45 templates/misago/admin/conf/index.html:5
 #: templates/misago/admin/themes/form.html:48
 msgid "Settings"
 msgstr "Paramètres"
 
-#: conf/admin/__init__.py:48 templates/misago/admin/socialauth/form.html:27
+#: conf/admin/__init__.py:52 templates/misago/admin/socialauth/form.html:27
 msgid "General"
 msgstr "Général"
 
-#: conf/admin/__init__.py:49
+#: conf/admin/__init__.py:53
 msgid "Change forum details like name, description or footer."
 msgstr ""
 
-#: conf/admin/__init__.py:54 templates/misago/admin/dashboard/totals.html:7
+#: conf/admin/__init__.py:58 templates/misago/admin/dashboard/totals.html:7
 #: templates/misago/admin/users/ban.html:22 templates/misago/navbar.html:42
 #: templates/misago/userslists/base.html:5
 #: templates/misago/userslists/base.html:14 users/admin/__init__.py:74
@@ -498,28 +498,38 @@ msgstr ""
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: conf/admin/__init__.py:56
+#: conf/admin/__init__.py:60
 msgid "Customize user accounts default behavior and features availability."
 msgstr ""
 
-#: conf/admin/__init__.py:63
+#: conf/admin/__init__.py:67
 msgid "Captcha"
 msgstr ""
 
-#: conf/admin/__init__.py:65
+#: conf/admin/__init__.py:69
 msgid "Setup protection against automatic registrations on the site."
 msgstr ""
 
-#: conf/admin/__init__.py:72 templates/misago/admin/dashboard/analytics.html:7
+#: conf/admin/__init__.py:76
+msgid "Single Sign-On"
+msgstr ""
+
+#: conf/admin/__init__.py:78
+msgid ""
+"SSO enables you to delegate user login and registration from Misago tothe "
+"third party site."
+msgstr ""
+
+#: conf/admin/__init__.py:86 templates/misago/admin/dashboard/analytics.html:7
 #: templates/misago/admin/dashboard/index.html:40
 msgid "Analytics"
 msgstr ""
 
-#: conf/admin/__init__.py:73
+#: conf/admin/__init__.py:87
 msgid "Enable Google Analytics or setup Google Site Verification."
 msgstr ""
 
-#: conf/admin/__init__.py:80
+#: conf/admin/__init__.py:94
 msgid "Threads, posts, polls and attachments options."
 msgstr ""
 
@@ -757,6 +767,39 @@ msgid ""
 "Address under which site is running appears to be \"%(address)s\"."
 msgstr ""
 
+#: conf/admin/forms/sso.py:13
+msgid "Enable Single Sign-On"
+msgstr ""
+
+#: conf/admin/forms/sso.py:15
+msgid ""
+"Enabling SSO will make login option redirect users to the server URL "
+"configured below. It will also disable option to register on forum, change "
+"username, email or passward, as those features will be delegated to the 3rd "
+"party site."
+msgstr ""
+
+#: conf/admin/forms/sso.py:22
+msgid "Public key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:24 conf/admin/forms/sso.py:32
+msgid ""
+"Leave this field empty for Misago to generate this key on form submission."
+msgstr ""
+
+#: conf/admin/forms/sso.py:30
+msgid "Private key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:37
+msgid "Server URL"
+msgstr ""
+
+#: conf/admin/forms/sso.py:50
+msgid "You need to enter server URL to enable SSO."
+msgstr ""
+
 #: conf/admin/forms/threads.py:27
 msgid "Daily post limit per user"
 msgstr ""
@@ -1068,7 +1111,7 @@ msgstr ""
 msgid "This value must be lower than number of users per page."
 msgstr ""
 
-#: conf/admin/views.py:39
+#: conf/admin/views.py:40
 msgid "Settings have been saved."
 msgstr ""
 
@@ -1118,11 +1161,6 @@ msgstr "Cette action n'est pas autorisée pour les invités."
 #: core/templatetags/misago_pagetitle.py:10
 #: templates/misago/thread/private_thread.html:7
 #: templates/misago/thread/thread.html:7
-#: templates/misago/threadslist/category.html:8
-#: templates/misago/threadslist/category.html:13
-#: templates/misago/threadslist/private_threads.html:8
-#: templates/misago/threadslist/private_threads.html:13
-#: templates/misago/threadslist/threads.html:16
 #, python-format
 msgid "page: %(page)s"
 msgstr "page : %(page)s"
@@ -1251,7 +1289,7 @@ msgstr ""
 
 #: legal/admin/forms.py:27 templates/misago/admin/themes/assets/css.html:17
 msgid "Link"
-msgstr ""
+msgstr "Lien"
 
 #: legal/admin/forms.py:29
 msgid "If your agreement is located on other page, enter here a link to it."
@@ -1350,15 +1388,28 @@ msgstr "Termes de service"
 msgid "Privacy policy"
 msgstr "Politique de confidentialite"
 
-#: markup/finalise.py:20
+#: markup/finalize.py:24
 #, python-format
 msgid "%(title)s has written:"
 msgstr "%(title)s a écrit :"
 
-#: markup/finalise.py:22
+#: markup/finalize.py:26
 msgid "Quoted message:"
 msgstr "Message cité :"
 
+#: markup/finalize.py:33
+#, python-format
+msgid "%(title)s:"
+msgstr ""
+
+#: markup/finalize.py:35
+msgid "Spoiler:"
+msgstr ""
+
+#: markup/finalize.py:40
+msgid "Reveal spoiler"
+msgstr ""
+
 #: search/api.py:17 search/views.py:12 search/views.py:21
 msgid "You don't have permission to search site."
 msgstr "Vous n'avez pas le permission de parcourir le contenu du site."
@@ -1475,6 +1526,18 @@ msgstr ""
 msgid "Please try resubmitting the form."
 msgstr "Veuillez resoumettre le formulaire."
 
+#: socialauth/views.py:23
+msgid "Please use the 3rd party site to login."
+msgstr ""
+
+#: sso/validators.py:24 users/validators.py:79
+msgid "This username is not allowed."
+msgstr "Ce nom d'utilisateur n'est pas autorisé."
+
+#: sso/validators.py:33 users/forms/register.py:45 users/validators.py:51
+msgid "This e-mail address is not allowed."
+msgstr "Ce courriel n'est pas autorisé."
+
 #: templates/misago/acl_debug.html:5
 #, python-format
 msgid ""
@@ -1636,7 +1699,7 @@ msgstr ""
 
 #: templates/misago/admin/agreements/list.html:82
 msgid "never"
-msgstr ""
+msgstr "jamais"
 
 #: templates/misago/admin/agreements/list.html:95
 #: templates/misago/admin/themes/list.html:78
@@ -1907,7 +1970,7 @@ msgstr "Catégorie"
 #: templates/misago/admin/dashboard/totals.html:31
 #: templates/misago/admin/users/list.html:21
 #: templates/misago/profile/posts.html:5 templates/misago/profile/posts.html:8
-#: templates/misago/profile/posts.html:9 users/apps.py:94
+#: templates/misago/profile/posts.html:9 users/apps.py:102
 msgid "Posts"
 msgstr "Messages"
 
@@ -2049,45 +2112,56 @@ msgstr ""
 msgid "Attachment error images"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:8
+#: templates/misago/admin/conf/users_settings.html:9
+#: templates/misago/admin/socialauth/list.html:97
+msgid "Note"
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:9
+msgid ""
+"Single Sign-On is enabled. Site's registration, password and deletion "
+"features have been disabled and delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:14
 msgid "New accounts"
 msgstr "Nouveaux comptes"
 
-#: templates/misago/admin/conf/users_settings.html:17 users/admin/forms.py:484
+#: templates/misago/admin/conf/users_settings.html:23 users/admin/forms.py:484
 #: users/admin/forms.py:573
 msgid "Usernames"
 msgstr "Noms d'utilisateurs"
 
-#: templates/misago/admin/conf/users_settings.html:27
+#: templates/misago/admin/conf/users_settings.html:33
 msgid "Avatars"
 msgstr "Avatars"
 
-#: templates/misago/admin/conf/users_settings.html:43
+#: templates/misago/admin/conf/users_settings.html:49
 msgid "Signatures"
 msgstr "Signatures"
 
-#: templates/misago/admin/conf/users_settings.html:51
+#: templates/misago/admin/conf/users_settings.html:57
 #: users/admin/__init__.py:80
 msgid "Data downloads"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:60
+#: templates/misago/admin/conf/users_settings.html:66
 msgid "Own account deletion"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:68 users/admin/forms.py:492
+#: templates/misago/admin/conf/users_settings.html:74 users/admin/forms.py:492
 msgid "IP addresses"
 msgstr "Adresses IP"
 
-#: templates/misago/admin/conf/users_settings.html:76
+#: templates/misago/admin/conf/users_settings.html:82
 msgid "Default subscription preferences"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:85
+#: templates/misago/admin/conf/users_settings.html:91
 msgid "Users lists"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:94
+#: templates/misago/admin/conf/users_settings.html:100
 msgid "Top posters ranking"
 msgstr ""
 
@@ -2609,7 +2683,7 @@ msgid "Enabled login methods"
 msgstr ""
 
 #: templates/misago/admin/socialauth/list.html:15
-#: templates/misago/admin/socialauth/list.html:106
+#: templates/misago/admin/socialauth/list.html:112
 msgid "Provider"
 msgstr ""
 
@@ -2625,19 +2699,25 @@ msgstr ""
 msgid "Are you sure you want to disable this social login provider?"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:100
+#: templates/misago/admin/socialauth/list.html:97
+msgid ""
+"Single Sign-On is enabled. Social authentication has been disabled and "
+"delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/socialauth/list.html:106
 msgid "Setup new login method"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:119
+#: templates/misago/admin/socialauth/list.html:125
 msgid "Setup login with this provider"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:120
+#: templates/misago/admin/socialauth/list.html:126
 msgid "Setup"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:127
+#: templates/misago/admin/socialauth/list.html:133
 msgid "No new login providers are available for setup at this time."
 msgstr ""
 
@@ -2936,7 +3016,7 @@ msgstr ""
 msgid "Signature"
 msgstr "Signature"
 
-#: templates/misago/admin/users/edit.html:228 users/apps.py:24
+#: templates/misago/admin/users/edit.html:228 users/apps.py:27
 msgid "Forum options"
 msgstr "Options du forum"
 
@@ -3209,7 +3289,7 @@ msgid ""
 "download."
 msgstr ""
 
-#: templates/misago/emails/data_download.html:11 users/apps.py:52
+#: templates/misago/emails/data_download.html:11 users/apps.py:57
 msgid "Download data"
 msgstr ""
 
@@ -3635,7 +3715,7 @@ msgstr "Voir les résultats"
 #: templates/misago/profile/ban_details.html:5
 #: templates/misago/profile/ban_details.html:8
 #: templates/misago/profile/ban_details.html:9
-#: templates/misago/profile/ban_details.html:16 users/apps.py:129
+#: templates/misago/profile/ban_details.html:16 users/apps.py:137
 msgid "Ban details"
 msgstr "Details de l'interdiction"
 
@@ -3684,7 +3764,7 @@ msgstr[1] "A initié %(threads)s fils de discussion"
 #: templates/misago/profile/details.html:5
 #: templates/misago/profile/details.html:8
 #: templates/misago/profile/details.html:9
-#: templates/misago/profile/details.html:19 users/apps.py:116
+#: templates/misago/profile/details.html:19 users/apps.py:124
 msgid "Details"
 msgstr "Détails"
 
@@ -3715,7 +3795,7 @@ msgstr ""
 
 #: templates/misago/profile/followers.html:5
 #: templates/misago/profile/followers.html:8
-#: templates/misago/profile/followers.html:9 users/apps.py:104
+#: templates/misago/profile/followers.html:9 users/apps.py:112
 msgid "Followers"
 msgstr "Suiveurs"
 
@@ -3744,7 +3824,7 @@ msgstr "Personne ne suit %(username)s."
 
 #: templates/misago/profile/follows.html:5
 #: templates/misago/profile/follows.html:8
-#: templates/misago/profile/follows.html:9 users/apps.py:110
+#: templates/misago/profile/follows.html:9 users/apps.py:118
 msgid "Follows"
 msgstr "Suit"
 
@@ -3832,7 +3912,7 @@ msgstr "%(username)s n'a démarré aucun fil de discussion."
 
 #: templates/misago/profile/username_history.html:5
 #: templates/misago/profile/username_history.html:8
-#: templates/misago/profile/username_history.html:9 users/apps.py:122
+#: templates/misago/profile/username_history.html:9 users/apps.py:130
 msgid "Username history"
 msgstr "Historique du nom d'utilisateur"
 
@@ -3866,7 +3946,7 @@ msgstr ""
 
 #: templates/misago/required_agreement.html:19
 msgid "here"
-msgstr ""
+msgstr "ici"
 
 #: templates/misago/required_agreement.html:21
 #, python-format
@@ -4130,7 +4210,7 @@ msgstr ""
 #: templates/misago/thread/thread.html:25
 #: templates/misago/thread/thread.html:36
 msgid "Closed."
-msgstr ""
+msgstr "Fermé."
 
 #: templates/misago/thread/toolbar-top.html:6
 msgid "Go to first new post"
@@ -4152,30 +4232,30 @@ msgstr ""
 msgid "Best answer"
 msgstr ""
 
-#: templates/misago/threadslist/base.html:58
+#: templates/misago/threadslist/base.html:57
 msgid "There are no threads in this category."
 msgstr "Il n'y a pas de fil de discussion dans cette catégorie."
 
-#: templates/misago/threadslist/base.html:60
+#: templates/misago/threadslist/base.html:59
 msgid "There are no threads on this forum... yet!"
 msgstr "Il n'y a aucun fil de discussion sur ce forum… pour l'instant !"
 
-#: templates/misago/threadslist/base.html:64
-#: templates/misago/threadslist/private_threads.html:67
+#: templates/misago/threadslist/base.html:63
+#: templates/misago/threadslist/private_threads.html:61
 msgid "Why not start one yourself?"
 msgstr "Pourquoi ne pas en commencer un vous-même ?"
 
-#: templates/misago/threadslist/base.html:68
-#: templates/misago/threadslist/private_threads.html:70
+#: templates/misago/threadslist/base.html:67
+#: templates/misago/threadslist/private_threads.html:64
 msgid "No threads matching specified criteria were found."
 msgstr ""
 "Aucun fil de discussion correspondant aux critères spécifiés n'a été trouvé."
 
-#: templates/misago/threadslist/base.html:83
+#: templates/misago/threadslist/base.html:82
 msgid "Next page"
 msgstr "Page suivante"
 
-#: templates/misago/threadslist/private_threads.html:48
+#: templates/misago/threadslist/private_threads.html:42
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
@@ -4183,7 +4263,7 @@ msgstr ""
 "Les fils de discussion privés sont des fils de discussion auxquels seuls "
 "leurs créateurs et les personnes invitées peuvent avoir accès et participer."
 
-#: templates/misago/threadslist/private_threads.html:64
+#: templates/misago/threadslist/private_threads.html:58
 msgid "You aren't participating in any private threads."
 msgstr "Vous ne participez à aucun fil de discussion privé."
 
@@ -4217,7 +4297,7 @@ msgstr "Sondage"
 
 #: templates/misago/userslists/active_posters.html:5
 #: templates/misago/userslists/active_posters.html:23
-#: templates/misago/userslists/active_posters.html:24 users/apps.py:73
+#: templates/misago/userslists/active_posters.html:24 users/apps.py:81
 msgid "Top posters"
 msgstr ""
 
@@ -4893,7 +4973,7 @@ msgstr ""
 
 #: threads/api/threadendpoints/patch.py:65
 msgid "Not a valid string."
-msgstr ""
+msgstr "Chaîne de caractères non valide."
 
 #: threads/api/threadendpoints/patch.py:86
 msgid "You can't change globally pinned threads weights in this category."
@@ -4926,7 +5006,7 @@ msgstr "Vous n'avez pas l'autorisation d'ouvrir ce fil de discussion."
 #: threads/api/threadendpoints/patch.py:327
 #: threads/api/threadendpoints/patch.py:355
 msgid "A valid integer is required."
-msgstr ""
+msgstr "Un nombre valide est requis."
 
 #: threads/api/threadendpoints/patch.py:238
 msgid "This post is already marked as thread's best answer."
@@ -5077,7 +5157,7 @@ msgstr "Peut télécharger des pièces jointes"
 
 #: threads/permissions/bestanswers.py:28
 msgid "Best answers"
-msgstr ""
+msgstr "Meilleures réponses"
 
 #: threads/permissions/bestanswers.py:31
 msgid "Can mark posts as best answers"
@@ -5246,6 +5326,8 @@ msgstr ""
 #: threads/permissions/bestanswers.py:356
 msgid "You can't delete this post because its marked as best answer."
 msgstr ""
+"Vous ne pouvez pas supprimer ce post car il est considéré comme étant la "
+"meilleure réponse."
 
 #: threads/permissions/polls.py:28
 msgid "Polls"
@@ -5435,10 +5517,8 @@ msgid "Can add everyone to threads"
 msgstr "Peut ajouter tout le monde aux fils de discussion"
 
 #: threads/permissions/privatethreads.py:46
-msgid "Allows user to add users that are blocking him to private threads."
+msgid "Allows user to add users that are blocking them to private threads."
 msgstr ""
-"Permet à l'utilisateur d'ajouter des utilisateurs qui le bloquent dans des "
-"fils de discussion privés."
 
 #: threads/permissions/privatethreads.py:50
 msgid "Can report private threads"
@@ -6628,7 +6708,7 @@ msgstr "Vous devez faire un choix"
 
 #: threads/signals.py:168
 msgid "Question"
-msgstr ""
+msgstr "Question"
 
 #: threads/signals.py:169
 msgid "Choices"
@@ -7442,22 +7522,27 @@ msgstr "Le nouvel utilisateur « %(user)s » a été enregistré."
 msgid "User \"%(user)s\" has been edited."
 msgstr "L'utilisateur « %(user)s » a été modifié."
 
-#: users/api/auth.py:94
+#: users/api/auth.py:42 users/api/auth.py:92 users/api/auth.py:130
+#: users/api/auth.py:174
+msgid "Please use the 3rd party site to authenticate."
+msgstr ""
+
+#: users/api/auth.py:100
 #, python-format
 msgid "Activate %(user)s account on %(forum_name)s forums"
 msgstr "Activer  %(user)s  sur les forums  %(forum_name)s "
 
-#: users/api/auth.py:129
+#: users/api/auth.py:138
 #, python-format
 msgid "Change %(user)s password on %(forum_name)s forums"
 msgstr ""
 "Changer les mots de passe de  %(user)s  sur les forums  %(forum_name)s "
 
-#: users/api/auth.py:164
+#: users/api/auth.py:176
 msgid "Form link is invalid. Please try again."
 msgstr "Le lien associé à ce formulaire est non valide. Veuillez réessayer."
 
-#: users/api/auth.py:165
+#: users/api/auth.py:177
 msgid "Your link has expired. Please request new one."
 msgstr "votre lien a expiré. veuillez en demander un nouveau."
 
@@ -7568,65 +7653,85 @@ msgstr ""
 msgid "You have to sign in to perform this action."
 msgstr "Vous devez vous identifier pour réaliser cette action."
 
-#: users/api/users.py:109
+#: users/api/users.py:89
+msgid "Please use the 3rd party site to register."
+msgstr ""
+
+#: users/api/users.py:112
 msgid "You can't change other users avatars."
 msgstr "Vous ne pouvez modifier les avatars des autres utilisateurs."
 
-#: users/api/users.py:121
+#: users/api/users.py:124
 msgid "You can't change other users options."
 msgstr "Vous ne pouvez modifier les options des autres utilisateurs."
 
-#: users/api/users.py:126
+#: users/api/users.py:129
 msgid "Your forum options have been changed."
 msgstr "Les options de votre forum ont été modifiées."
 
-#: users/api/users.py:132
+#: users/api/users.py:136
+msgid "Please use the 3rd party site to change your username."
+msgstr ""
+
+#: users/api/users.py:140
 msgid "You can't change other users names."
 msgstr "Vous ne pouvez modifier les noms des autres utilisateurs."
 
-#: users/api/users.py:139
+#: users/api/users.py:147
 msgid "You can't change other users signatures."
 msgstr "Vous ne pouvez modifier les identifiants des autres utilisateurs."
 
-#: users/api/users.py:151
+#: users/api/users.py:160
+msgid "Please use the 3rd party site to change your password."
+msgstr ""
+
+#: users/api/users.py:164
 msgid "You can't change other users passwords."
 msgstr "Vous ne pouvez modifier les mots de passe des autres utilisateurs."
 
-#: users/api/users.py:161
+#: users/api/users.py:174
+msgid "Please use the 3rd party site to change your e-mail."
+msgstr ""
+
+#: users/api/users.py:179
 msgid "You can't change other users e-mail addresses."
 msgstr "Vous ne pouvez modifier les courriels des autres utilisateurs."
 
-#: users/api/users.py:268
+#: users/api/users.py:210
+msgid "Please use the 3rd party site to delete account."
+msgstr ""
+
+#: users/api/users.py:291
 msgid "You can't request data downloads for other users."
 msgstr ""
 
-#: users/api/users.py:272
+#: users/api/users.py:295
 msgid "You can't download your data."
 msgstr ""
 
-#: users/api/users.py:277
+#: users/api/users.py:300
 msgid "You can't have more than one data download request at a single time."
 msgstr ""
 
-#: users/api/users.py:333
+#: users/api/users.py:356
 msgid "You can't see other users data downloads."
 msgstr ""
 
-#: users/apps.py:30
+#: users/apps.py:33
 msgid "Edit details"
 msgstr "Modifier les détails"
 
-#: users/apps.py:36
+#: users/apps.py:39
 msgid "Change username"
 msgstr "Changer de nom d'utilisateur"
 
-#: users/apps.py:42
+#: users/apps.py:46
 msgid "Change email or password"
 msgstr "Changer le courriel ou le mot de passe"
 
-#: users/apps.py:63
+#: users/apps.py:71
 msgid "Delete account"
-msgstr ""
+msgstr "Supprimer le compte"
 
 #: users/avatars/uploaded.py:38
 msgid "Uploaded file is too big."
@@ -7705,7 +7810,7 @@ msgstr "Le courriel est invalide"
 msgid "No user with this e-mail exists."
 msgstr "Il n'existe pas d'utilisateur avec ce courriel."
 
-#: users/forms/auth.py:150 users/views/activation.py:45
+#: users/forms/auth.py:150 users/views/activation.py:51
 #, python-format
 msgid "%(user)s, your account is already active."
 msgstr "%(user)s, votre compte est déjà actif."
@@ -7735,10 +7840,6 @@ msgstr ""
 msgid "This usernane is not allowed."
 msgstr "Ce nom d'utilisateur n'est pas autorisé."
 
-#: users/forms/register.py:45 users/validators.py:51
-msgid "This e-mail address is not allowed."
-msgstr "Ce courriel n'est pas autorisé."
-
 #: users/forms/register.py:51
 msgid "This agreement is required."
 msgstr ""
@@ -7778,7 +7879,7 @@ msgstr ""
 
 #: users/models/datadownload.py:28
 msgid "Ready"
-msgstr ""
+msgstr "Prêt"
 
 #: users/models/user.py:106
 msgid "Notify"
@@ -7897,7 +7998,7 @@ msgstr "Vous ne pouvez supprimer des utilisateurs."
 
 #: users/permissions/delete.py:77 users/permissions/delete.py:106
 msgid "You can't delete your account."
-msgstr ""
+msgstr "Vous ne pouvez pas supprimer votre compte."
 
 #: users/permissions/delete.py:79
 msgid "You can't delete administrators."
@@ -8267,10 +8368,6 @@ msgstr "Ce courriel n'est pas disponible."
 msgid "This username is not available."
 msgstr "Ce nom d'utilisateur n'est pas disponible."
 
-#: users/validators.py:79
-msgid "This username is not allowed."
-msgstr "Ce nom d'utilisateur n'est pas autorisé."
-
 #: users/validators.py:85
 msgid "Username can only contain latin alphabet letters and digits."
 msgstr ""
@@ -8305,7 +8402,11 @@ msgstr ""
 msgid "This email is not allowed."
 msgstr "Ce courriel n'est pas autorisé."
 
-#: users/views/activation.py:50
+#: users/views/activation.py:21
+msgid "Please use the 3rd party site to activate your account."
+msgstr ""
+
+#: users/views/activation.py:56
 #, python-format
 msgid ""
 "%(user)s, your activation link is invalid. Try again or request new "
@@ -8314,12 +8415,16 @@ msgstr ""
 "%(user)s, votre lien d'activation est invalide. Veuillez réessayer ou "
 "demander un nouveau lien d'activation. "
 
-#: users/views/activation.py:68
+#: users/views/activation.py:74
 #, python-format
 msgid "%(user)s, your account has been activated!"
 msgstr "%(user)s, votre compte a été activé !"
 
-#: users/views/forgottenpassword.py:39
+#: users/views/forgottenpassword.py:18 users/views/options.py:70
+msgid "Please use the 3rd party site to change password."
+msgstr ""
+
+#: users/views/forgottenpassword.py:45
 #, python-format
 msgid ""
 "%(user)s, your link has expired. Please request new link and try again."
@@ -8327,19 +8432,23 @@ msgstr ""
 "%(user)s, votre lien a expiré. Veuillez demande un nouveau lien et "
 "réessayer."
 
-#: users/views/forgottenpassword.py:46
+#: users/views/forgottenpassword.py:52
 #, python-format
 msgid "%(user)s, your link is invalid. Please try again or request new link."
 msgstr ""
 "%(user)s, votre lien est invalide. Veuillez réessayer et demander un nouveau"
 " lien."
 
-#: users/views/options.py:55
+#: users/views/options.py:47
+msgid "Please use the 3rd party site to change e-mail."
+msgstr ""
+
+#: users/views/options.py:59
 #, python-format
 msgid "%(user)s, your e-mail has been changed."
 msgstr "%(user)s, votre courriel a été modifié."
 
-#: users/views/options.py:73
+#: users/views/options.py:80
 #, python-format
 msgid "%(user)s, your password has been changed."
 msgstr "%(user)s, votre mot de passe a été modifié."

BIN
misago/locale/fr/LC_MESSAGES/djangojs.mo


+ 39 - 33
misago/locale/fr/LC_MESSAGES/djangojs.po

@@ -7,15 +7,16 @@
 # Amandine G <amandyfriendly@msn.com>, 2017
 # Olivier Cortès <olive@deep-ocean.net>, 2018
 # Palimpseste, 2018
+# Jimmy RUNDSTADLER, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-06 13:05+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
-"Last-Translator: Palimpseste, 2018\n"
+"Last-Translator: Jimmy RUNDSTADLER, 2019\n"
 "Language-Team: French (https://www.transifex.com/misago/teams/65369/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -105,7 +106,7 @@ msgstr "Utilisateur à ajouter"
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:13
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:17
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -296,6 +297,10 @@ msgid "Edit details"
 msgstr "Mettre à jour vos informations"
 
 #: static/misago/js/misago.js:2
+msgid "Insert spoiler"
+msgstr ""
+
+#: static/misago/js/misago.js:2
 msgid "Enter name of syntax of your code (optional)"
 msgstr "Saisir le nom syntaxique de votre code (facultatif)"
 
@@ -303,7 +308,7 @@ msgstr "Saisir le nom syntaxique de votre code (facultatif)"
 msgid "Insert code"
 msgstr "Déposer le code"
 
-#: static/misago/js/misago.js:2
+#: static/misago/js/misago.js:3
 msgid "Emphase selection"
 msgstr "Accentuer la selection"
 
@@ -413,10 +418,10 @@ msgstr "(erreur)"
 msgid "(success)"
 msgstr "(succes)"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:10
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:11
 #: static/misago/js/misago.js:17
 msgid "Best answer"
-msgstr ""
+msgstr "Meilleure réponse"
 
 #: static/misago/js/misago.js:4
 msgid ""
@@ -465,7 +470,8 @@ msgstr "Posté par %(poster)s le %(posted_on)s dans %(category)s."
 msgid "%(title)s, joined on %(joined_on)s"
 msgstr "%(title)s, membre depuis le %(joined_on)s"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:13
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
+#: static/misago/js/misago.js:13
 msgid "Change username"
 msgstr "Changer de nom d'utilisateur"
 
@@ -511,12 +517,11 @@ msgstr "Votre nouveau nom d'utilisateur est identique a l'actuel."
 msgid "New username"
 msgstr "Nouveau nom d'utilisateur"
 
-#: static/misago/js/misago.js:4
+#: static/misago/js/misago.js:5
 msgid "Your username has been changed successfully."
 msgstr "Votre nom d'utilisateur a bien été changé."
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change your options"
 msgstr "Changer vos options"
 
@@ -558,7 +563,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:5
 msgid "Delete my account"
-msgstr ""
+msgstr "Supprimer mon compte"
 
 #: static/misago/js/misago.js:5
 msgid "Your request for data download has been registered."
@@ -921,11 +926,11 @@ msgstr "Publier le sondage"
 msgid "Posted by %(poster)s %(posted_on)s."
 msgstr "Publié par %(poster)s le %(posted_on)s."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "Voting ends %(ends_on)s."
 msgstr "Les votes prennent fin le %(ends_on)s."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "%(votes)s vote."
 msgid_plural "%(votes)s votes."
 msgstr[0] "%(votes)s vote."
@@ -977,6 +982,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:7 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
+#: static/misago/js/misago.js:17
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1014,11 +1020,11 @@ msgstr "Sauvegarder votre vote"
 msgid "See results"
 msgstr "Voir les résultats"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert post to state from before this edit."
 msgstr "Revenir a la précédente version de la publication."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert"
 msgstr "Rétablir"
 
@@ -1038,7 +1044,7 @@ msgstr ""
 msgid "Post has been reverted to previous state."
 msgstr "La version précédente de la publication a été rétablie."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "See previous change"
 msgstr "Voir le changement précédent"
 
@@ -1141,7 +1147,7 @@ msgstr "Titre du fil"
 msgid "Post thread"
 msgstr "Publier le fil"
 
-#: static/misago/js/misago.js:8
+#: static/misago/js/misago.js:9
 msgid "Are you sure you want to discard thread?"
 msgstr "Êtes-vous sûr de vouloir supprimer le fil de discussion ?"
 
@@ -1236,7 +1242,7 @@ msgstr[1] ""
 "(actuellement %(show_value)s)."
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:10
-#: static/misago/js/misago.js:16
+#: static/misago/js/misago.js:16 static/misago/js/misago.js:17
 msgid "Hide"
 msgstr "Cacher"
 
@@ -1345,14 +1351,14 @@ msgstr "Caché par %(hidden_by)s %(hidden_on)s."
 msgid "This post is hidden. You cannot see its contents."
 msgstr "Cette publication est masquée. Vous ne pouvez pas voir son contenu."
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid ""
 "Are you sure you want to delete this post? This action is not reversible!"
 msgstr ""
 "Êtes-vous sûr de vouloir supprimer cette publication ? Cette action est "
 "irréversible !"
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid "Post has been deleted."
 msgstr "La publication a été supprimée."
 
@@ -1366,7 +1372,7 @@ msgstr "Lien permanent"
 
 #: static/misago/js/misago.js:10
 msgid "Mark as best answer"
-msgstr ""
+msgstr "Marquer comme meilleure réponse"
 
 #: static/misago/js/misago.js:10
 msgid "Unmark best answer"
@@ -1902,7 +1908,8 @@ msgid "Registration is currently unavailable due to an error."
 msgstr ""
 "L'inscription n'est actuellement pas disponible en raison d'une erreur."
 
-#: static/misago/js/misago.js:13 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:13 static/misago/js/misago.js:14
+#: static/misago/js/misago.js:20
 msgid "Register"
 msgstr "S'enregistrer"
 
@@ -2102,7 +2109,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:15
 msgid "E-mail address"
-msgstr ""
+msgstr "Adresse email"
 
 #: static/misago/js/misago.js:15
 msgid "Change title"
@@ -2139,7 +2146,7 @@ msgstr ""
 "Êtes-vous sûr de vouloir fusionner les publications sélectionnées ? Cette "
 "action est irréversible !"
 
-#: static/misago/js/misago.js:15
+#: static/misago/js/misago.js:16
 msgid ""
 "Are you sure you want to delete selected posts? This action is not "
 "reversible!"
@@ -2476,7 +2483,7 @@ msgstr "Modération des fils"
 msgid "One or more threads could not be deleted:"
 msgstr "Un ou plusieurs fils n'ont pas pu être supprimés:"
 
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid ""
 "You can't move threads because there are no categories you are allowed to "
 "move them to."
@@ -2484,7 +2491,7 @@ msgstr ""
 "Vous ne pouvez pas déplacer les fils car il n'y a pas de catégories dans "
 "lesquelles vous êtes autorisé à les déplacer."
 
-#: static/misago/js/misago.js:19
+#: static/misago/js/misago.js:20
 msgid ""
 "You need permission to start threads in category to be able to merge threads"
 " to it."
@@ -2562,16 +2569,15 @@ msgstr ""
 "Connectez-vous ou inscrivez-vous pour commencer et participer aux "
 "discussions"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "You have unread private threads!"
 msgstr ""
 
-#: static/misago/js/misago.js:20 static/misago/js/misago.js:21
-#: static/misago/js/misago.js:23
+#: static/misago/js/misago.js:21 static/misago/js/misago.js:23
 msgid "Private threads"
 msgstr "Fils de discussion privés"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "Are you sure you want to sign out?"
 msgstr "Êtes-vous certain⋅e de vouloir vous déconnecter ?"
 
@@ -2650,11 +2656,11 @@ msgstr[1] "%(followers)s suiveurs"
 msgid "No users have posted any new messages during last %(days)s days."
 msgstr "Aucun utilisateur n'a posté de message depuis %(days)s jours"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Rank"
 msgstr "Rang"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Ranked posts"
 msgstr "Messages classés"
 
@@ -2749,7 +2755,7 @@ msgstr "Vous travaillez déjà sur un autre message. Voulez-vous l'abandonner ?
 msgid "You are already working on a poll. Do you want to discard it?"
 msgstr "Vous travaillez déjà sur un sondage. Voulez-vous l'abandonner ?"
 
-#: static/misago/js/misago.js:24
+#: static/misago/js/misago.js:25
 msgid "You don't have permission to perform this action."
 msgstr "Vous n'avez pas la permission d'effectuer cette action."
 

BIN
misago/locale/ru/LC_MESSAGES/django.mo


+ 202 - 96
misago/locale/ru/LC_MESSAGES/django.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-07 17:33+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: alff0x1f <alff3one@gmail.com>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/misago/teams/65369/ru/)\n"
@@ -218,22 +218,21 @@ msgstr ""
 "Только пользователи с соответствующими правами могут оставлять сообщения в "
 "закрытых категориях."
 
-#: categories/admin/forms.py:70 conf/admin/__init__.py:79
+#: categories/admin/forms.py:70 conf/admin/__init__.py:93
 #: templates/misago/admin/categories/list.html:19
 #: templates/misago/admin/dashboard/totals.html:19
 #: templates/misago/navbar.html:20 templates/misago/navbar.html:36
 #: templates/misago/profile/threads.html:5
 #: templates/misago/profile/threads.html:8
 #: templates/misago/profile/threads.html:9
-#: templates/misago/threadslist/category.html:74
+#: templates/misago/threadslist/category.html:68
 #: templates/misago/threadslist/threads.html:14
 #: templates/misago/threadslist/threads.html:16
-#: templates/misago/threadslist/threads.html:18
-#: templates/misago/threadslist/threads.html:35
-#: templates/misago/threadslist/threads.html:44
-#: templates/misago/threadslist/threads.html:63
+#: templates/misago/threadslist/threads.html:33
+#: templates/misago/threadslist/threads.html:42
+#: templates/misago/threadslist/threads.html:66
 #: threads/permissions/threads.py:73 threads/permissions/threads.py:104
-#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:98
+#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:106
 msgid "Threads"
 msgstr "Темы"
 
@@ -465,20 +464,20 @@ msgstr "Можно смотреть содержимое категории"
 msgid "You don't have permission to browse \"%(category)s\" contents."
 msgstr "У вас нет разрешения просматривать содержимое \"%(category)s\"."
 
-#: conf/admin/__init__.py:41 templates/misago/admin/conf/index.html:5
+#: conf/admin/__init__.py:45 templates/misago/admin/conf/index.html:5
 #: templates/misago/admin/themes/form.html:48
 msgid "Settings"
 msgstr "Настройки"
 
-#: conf/admin/__init__.py:48 templates/misago/admin/socialauth/form.html:27
+#: conf/admin/__init__.py:52 templates/misago/admin/socialauth/form.html:27
 msgid "General"
 msgstr "Общее"
 
-#: conf/admin/__init__.py:49
+#: conf/admin/__init__.py:53
 msgid "Change forum details like name, description or footer."
 msgstr ""
 
-#: conf/admin/__init__.py:54 templates/misago/admin/dashboard/totals.html:7
+#: conf/admin/__init__.py:58 templates/misago/admin/dashboard/totals.html:7
 #: templates/misago/admin/users/ban.html:22 templates/misago/navbar.html:42
 #: templates/misago/userslists/base.html:5
 #: templates/misago/userslists/base.html:14 users/admin/__init__.py:74
@@ -486,28 +485,38 @@ msgstr ""
 msgid "Users"
 msgstr "Пользователи"
 
-#: conf/admin/__init__.py:56
+#: conf/admin/__init__.py:60
 msgid "Customize user accounts default behavior and features availability."
 msgstr ""
 
-#: conf/admin/__init__.py:63
+#: conf/admin/__init__.py:67
 msgid "Captcha"
 msgstr ""
 
-#: conf/admin/__init__.py:65
+#: conf/admin/__init__.py:69
 msgid "Setup protection against automatic registrations on the site."
 msgstr ""
 
-#: conf/admin/__init__.py:72 templates/misago/admin/dashboard/analytics.html:7
+#: conf/admin/__init__.py:76
+msgid "Single Sign-On"
+msgstr ""
+
+#: conf/admin/__init__.py:78
+msgid ""
+"SSO enables you to delegate user login and registration from Misago tothe "
+"third party site."
+msgstr ""
+
+#: conf/admin/__init__.py:86 templates/misago/admin/dashboard/analytics.html:7
 #: templates/misago/admin/dashboard/index.html:40
 msgid "Analytics"
 msgstr ""
 
-#: conf/admin/__init__.py:73
+#: conf/admin/__init__.py:87
 msgid "Enable Google Analytics or setup Google Site Verification."
 msgstr ""
 
-#: conf/admin/__init__.py:80
+#: conf/admin/__init__.py:94
 msgid "Threads, posts, polls and attachments options."
 msgstr ""
 
@@ -744,6 +753,39 @@ msgid ""
 "Address under which site is running appears to be \"%(address)s\"."
 msgstr ""
 
+#: conf/admin/forms/sso.py:13
+msgid "Enable Single Sign-On"
+msgstr ""
+
+#: conf/admin/forms/sso.py:15
+msgid ""
+"Enabling SSO will make login option redirect users to the server URL "
+"configured below. It will also disable option to register on forum, change "
+"username, email or passward, as those features will be delegated to the 3rd "
+"party site."
+msgstr ""
+
+#: conf/admin/forms/sso.py:22
+msgid "Public key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:24 conf/admin/forms/sso.py:32
+msgid ""
+"Leave this field empty for Misago to generate this key on form submission."
+msgstr ""
+
+#: conf/admin/forms/sso.py:30
+msgid "Private key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:37
+msgid "Server URL"
+msgstr ""
+
+#: conf/admin/forms/sso.py:50
+msgid "You need to enter server URL to enable SSO."
+msgstr ""
+
 #: conf/admin/forms/threads.py:27
 msgid "Daily post limit per user"
 msgstr ""
@@ -1054,7 +1096,7 @@ msgstr ""
 msgid "This value must be lower than number of users per page."
 msgstr ""
 
-#: conf/admin/views.py:39
+#: conf/admin/views.py:40
 msgid "Settings have been saved."
 msgstr ""
 
@@ -1104,11 +1146,6 @@ msgstr "Это действие не доступно гостю"
 #: core/templatetags/misago_pagetitle.py:10
 #: templates/misago/thread/private_thread.html:7
 #: templates/misago/thread/thread.html:7
-#: templates/misago/threadslist/category.html:8
-#: templates/misago/threadslist/category.html:13
-#: templates/misago/threadslist/private_threads.html:8
-#: templates/misago/threadslist/private_threads.html:13
-#: templates/misago/threadslist/threads.html:16
 #, python-format
 msgid "page: %(page)s"
 msgstr "страница: %(page)s"
@@ -1336,15 +1373,28 @@ msgstr "Условия использования"
 msgid "Privacy policy"
 msgstr "Политика конфиденциальности"
 
-#: markup/finalise.py:20
+#: markup/finalize.py:24
 #, python-format
 msgid "%(title)s has written:"
 msgstr "%(title)s написал:"
 
-#: markup/finalise.py:22
+#: markup/finalize.py:26
 msgid "Quoted message:"
 msgstr "Цитата:"
 
+#: markup/finalize.py:33
+#, python-format
+msgid "%(title)s:"
+msgstr ""
+
+#: markup/finalize.py:35
+msgid "Spoiler:"
+msgstr ""
+
+#: markup/finalize.py:40
+msgid "Reveal spoiler"
+msgstr ""
+
 #: search/api.py:17 search/views.py:12 search/views.py:21
 msgid "You don't have permission to search site."
 msgstr "У вас нет разрешения искать по сайту."
@@ -1461,6 +1511,18 @@ msgstr ""
 msgid "Please try resubmitting the form."
 msgstr "Пожалуйста, попробуйте повторно отправить эту форму."
 
+#: socialauth/views.py:23
+msgid "Please use the 3rd party site to login."
+msgstr ""
+
+#: sso/validators.py:24 users/validators.py:79
+msgid "This username is not allowed."
+msgstr "Данное имя пользователя запрещено."
+
+#: sso/validators.py:33 users/forms/register.py:45 users/validators.py:51
+msgid "This e-mail address is not allowed."
+msgstr "Этот e-mail адрес недоступен."
+
 #: templates/misago/acl_debug.html:5
 #, python-format
 msgid ""
@@ -1891,7 +1953,7 @@ msgstr "Категория"
 #: templates/misago/admin/dashboard/totals.html:31
 #: templates/misago/admin/users/list.html:21
 #: templates/misago/profile/posts.html:5 templates/misago/profile/posts.html:8
-#: templates/misago/profile/posts.html:9 users/apps.py:94
+#: templates/misago/profile/posts.html:9 users/apps.py:102
 msgid "Posts"
 msgstr "Сообщения"
 
@@ -2033,45 +2095,56 @@ msgstr ""
 msgid "Attachment error images"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:8
+#: templates/misago/admin/conf/users_settings.html:9
+#: templates/misago/admin/socialauth/list.html:97
+msgid "Note"
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:9
+msgid ""
+"Single Sign-On is enabled. Site's registration, password and deletion "
+"features have been disabled and delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:14
 msgid "New accounts"
 msgstr "Новые аккаунты"
 
-#: templates/misago/admin/conf/users_settings.html:17 users/admin/forms.py:484
+#: templates/misago/admin/conf/users_settings.html:23 users/admin/forms.py:484
 #: users/admin/forms.py:573
 msgid "Usernames"
 msgstr "Имена пользователя"
 
-#: templates/misago/admin/conf/users_settings.html:27
+#: templates/misago/admin/conf/users_settings.html:33
 msgid "Avatars"
 msgstr "Аватары"
 
-#: templates/misago/admin/conf/users_settings.html:43
+#: templates/misago/admin/conf/users_settings.html:49
 msgid "Signatures"
 msgstr "Подписи"
 
-#: templates/misago/admin/conf/users_settings.html:51
+#: templates/misago/admin/conf/users_settings.html:57
 #: users/admin/__init__.py:80
 msgid "Data downloads"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:60
+#: templates/misago/admin/conf/users_settings.html:66
 msgid "Own account deletion"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:68 users/admin/forms.py:492
+#: templates/misago/admin/conf/users_settings.html:74 users/admin/forms.py:492
 msgid "IP addresses"
 msgstr "IP адреса"
 
-#: templates/misago/admin/conf/users_settings.html:76
+#: templates/misago/admin/conf/users_settings.html:82
 msgid "Default subscription preferences"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:85
+#: templates/misago/admin/conf/users_settings.html:91
 msgid "Users lists"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:94
+#: templates/misago/admin/conf/users_settings.html:100
 msgid "Top posters ranking"
 msgstr ""
 
@@ -2597,7 +2670,7 @@ msgid "Enabled login methods"
 msgstr ""
 
 #: templates/misago/admin/socialauth/list.html:15
-#: templates/misago/admin/socialauth/list.html:106
+#: templates/misago/admin/socialauth/list.html:112
 msgid "Provider"
 msgstr ""
 
@@ -2613,19 +2686,25 @@ msgstr ""
 msgid "Are you sure you want to disable this social login provider?"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:100
+#: templates/misago/admin/socialauth/list.html:97
+msgid ""
+"Single Sign-On is enabled. Social authentication has been disabled and "
+"delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/socialauth/list.html:106
 msgid "Setup new login method"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:119
+#: templates/misago/admin/socialauth/list.html:125
 msgid "Setup login with this provider"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:120
+#: templates/misago/admin/socialauth/list.html:126
 msgid "Setup"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:127
+#: templates/misago/admin/socialauth/list.html:133
 msgid "No new login providers are available for setup at this time."
 msgstr ""
 
@@ -2928,7 +3007,7 @@ msgstr ""
 msgid "Signature"
 msgstr "Подпись"
 
-#: templates/misago/admin/users/edit.html:228 users/apps.py:24
+#: templates/misago/admin/users/edit.html:228 users/apps.py:27
 msgid "Forum options"
 msgstr "Опции форума"
 
@@ -3191,7 +3270,7 @@ msgid ""
 "download."
 msgstr ""
 
-#: templates/misago/emails/data_download.html:11 users/apps.py:52
+#: templates/misago/emails/data_download.html:11 users/apps.py:57
 msgid "Download data"
 msgstr ""
 
@@ -3623,7 +3702,7 @@ msgstr "Смотреть результаты"
 #: templates/misago/profile/ban_details.html:5
 #: templates/misago/profile/ban_details.html:8
 #: templates/misago/profile/ban_details.html:9
-#: templates/misago/profile/ban_details.html:16 users/apps.py:129
+#: templates/misago/profile/ban_details.html:16 users/apps.py:137
 msgid "Ban details"
 msgstr "Детали блокировки"
 
@@ -3676,7 +3755,7 @@ msgstr[3] "Начал %(threads)s тем."
 #: templates/misago/profile/details.html:5
 #: templates/misago/profile/details.html:8
 #: templates/misago/profile/details.html:9
-#: templates/misago/profile/details.html:19 users/apps.py:116
+#: templates/misago/profile/details.html:19 users/apps.py:124
 msgid "Details"
 msgstr "Детали"
 
@@ -3706,7 +3785,7 @@ msgstr ""
 
 #: templates/misago/profile/followers.html:5
 #: templates/misago/profile/followers.html:8
-#: templates/misago/profile/followers.html:9 users/apps.py:104
+#: templates/misago/profile/followers.html:9 users/apps.py:112
 msgid "Followers"
 msgstr "Последователи"
 
@@ -3739,7 +3818,7 @@ msgstr "У %(username)s нет последователей."
 
 #: templates/misago/profile/follows.html:5
 #: templates/misago/profile/follows.html:8
-#: templates/misago/profile/follows.html:9 users/apps.py:110
+#: templates/misago/profile/follows.html:9 users/apps.py:118
 msgid "Follows"
 msgstr "Следить"
 
@@ -3839,7 +3918,7 @@ msgstr "У %(username)s нет начатых тем."
 
 #: templates/misago/profile/username_history.html:5
 #: templates/misago/profile/username_history.html:8
-#: templates/misago/profile/username_history.html:9 users/apps.py:122
+#: templates/misago/profile/username_history.html:9 users/apps.py:130
 msgid "Username history"
 msgstr "История имени пользователя"
 
@@ -4164,29 +4243,29 @@ msgstr ""
 msgid "Best answer"
 msgstr "Лучший ответ"
 
-#: templates/misago/threadslist/base.html:58
+#: templates/misago/threadslist/base.html:57
 msgid "There are no threads in this category."
 msgstr "В этой категории ещё нет тем."
 
-#: templates/misago/threadslist/base.html:60
+#: templates/misago/threadslist/base.html:59
 msgid "There are no threads on this forum... yet!"
 msgstr "На этом форуме ещё нет тем... пока что!"
 
-#: templates/misago/threadslist/base.html:64
-#: templates/misago/threadslist/private_threads.html:67
+#: templates/misago/threadslist/base.html:63
+#: templates/misago/threadslist/private_threads.html:61
 msgid "Why not start one yourself?"
 msgstr "Почему бы Вам не начать тему?"
 
-#: templates/misago/threadslist/base.html:68
-#: templates/misago/threadslist/private_threads.html:70
+#: templates/misago/threadslist/base.html:67
+#: templates/misago/threadslist/private_threads.html:64
 msgid "No threads matching specified criteria were found."
 msgstr "Не найдено тем совпадающих с указанными критериями."
 
-#: templates/misago/threadslist/base.html:83
+#: templates/misago/threadslist/base.html:82
 msgid "Next page"
 msgstr "Следующая страница"
 
-#: templates/misago/threadslist/private_threads.html:48
+#: templates/misago/threadslist/private_threads.html:42
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
@@ -4194,7 +4273,7 @@ msgstr ""
 "Приватные темы - темы, в которые есть доступ только по приглашению другого "
 "участника, создавшего или имеющего разрешение приглашать в тему."
 
-#: templates/misago/threadslist/private_threads.html:64
+#: templates/misago/threadslist/private_threads.html:58
 msgid "You aren't participating in any private threads."
 msgstr "Вы не участник ни в каких приватных темах."
 
@@ -4228,7 +4307,7 @@ msgstr "Опрос"
 
 #: templates/misago/userslists/active_posters.html:5
 #: templates/misago/userslists/active_posters.html:23
-#: templates/misago/userslists/active_posters.html:24 users/apps.py:73
+#: templates/misago/userslists/active_posters.html:24 users/apps.py:81
 msgid "Top posters"
 msgstr ""
 
@@ -5443,10 +5522,8 @@ msgid "Can add everyone to threads"
 msgstr "Можно добавлять в тему кого угодно"
 
 #: threads/permissions/privatethreads.py:46
-msgid "Allows user to add users that are blocking him to private threads."
+msgid "Allows user to add users that are blocking them to private threads."
 msgstr ""
-"Разрешает пользователю добавлять пользователей, которые заблокированы им, в "
-"приватный темы."
 
 #: threads/permissions/privatethreads.py:50
 msgid "Can report private threads"
@@ -7366,21 +7443,26 @@ msgstr "Новый пользователь \"%(user)s\" был зарегист
 msgid "User \"%(user)s\" has been edited."
 msgstr "Пользователь \"%(user)s\" был отредактирован."
 
-#: users/api/auth.py:94
+#: users/api/auth.py:42 users/api/auth.py:92 users/api/auth.py:130
+#: users/api/auth.py:174
+msgid "Please use the 3rd party site to authenticate."
+msgstr ""
+
+#: users/api/auth.py:100
 #, python-format
 msgid "Activate %(user)s account on %(forum_name)s forums"
 msgstr "Активировать аккаунт %(user)s на %(forum_name)s форумах."
 
-#: users/api/auth.py:129
+#: users/api/auth.py:138
 #, python-format
 msgid "Change %(user)s password on %(forum_name)s forums"
 msgstr "Изменить пароль %(user)s на %(forum_name)s форумах"
 
-#: users/api/auth.py:164
+#: users/api/auth.py:176
 msgid "Form link is invalid. Please try again."
 msgstr "Ссылка формы неправильна. Пожалуйста, попробуйте заново."
 
-#: users/api/auth.py:165
+#: users/api/auth.py:177
 msgid "Your link has expired. Please request new one."
 msgstr "Ваша ссылка истекла. Пожалуйста, запросите новую."
 
@@ -7483,63 +7565,83 @@ msgstr "У вас нет разрешения просматривать ист
 msgid "You have to sign in to perform this action."
 msgstr "Вы должны войти, чтобы выполнить это действие."
 
-#: users/api/users.py:109
+#: users/api/users.py:89
+msgid "Please use the 3rd party site to register."
+msgstr ""
+
+#: users/api/users.py:112
 msgid "You can't change other users avatars."
 msgstr "Вы не можете изменять аватары других пользователей."
 
-#: users/api/users.py:121
+#: users/api/users.py:124
 msgid "You can't change other users options."
 msgstr "Вы не можете изменять настройки других пользователей."
 
-#: users/api/users.py:126
+#: users/api/users.py:129
 msgid "Your forum options have been changed."
 msgstr "Ваши настройки форума были изменены."
 
-#: users/api/users.py:132
+#: users/api/users.py:136
+msgid "Please use the 3rd party site to change your username."
+msgstr ""
+
+#: users/api/users.py:140
 msgid "You can't change other users names."
 msgstr "Вы не можете менять имена других пользователей."
 
-#: users/api/users.py:139
+#: users/api/users.py:147
 msgid "You can't change other users signatures."
 msgstr "Вы не можете менять подписи других пользователей."
 
-#: users/api/users.py:151
+#: users/api/users.py:160
+msgid "Please use the 3rd party site to change your password."
+msgstr ""
+
+#: users/api/users.py:164
 msgid "You can't change other users passwords."
 msgstr "Вы не можете менять пароли других пользователей."
 
-#: users/api/users.py:161
+#: users/api/users.py:174
+msgid "Please use the 3rd party site to change your e-mail."
+msgstr ""
+
+#: users/api/users.py:179
 msgid "You can't change other users e-mail addresses."
 msgstr "Вы не можете менять e-mail адреса других пользователей."
 
-#: users/api/users.py:268
+#: users/api/users.py:210
+msgid "Please use the 3rd party site to delete account."
+msgstr ""
+
+#: users/api/users.py:291
 msgid "You can't request data downloads for other users."
 msgstr ""
 
-#: users/api/users.py:272
+#: users/api/users.py:295
 msgid "You can't download your data."
 msgstr ""
 
-#: users/api/users.py:277
+#: users/api/users.py:300
 msgid "You can't have more than one data download request at a single time."
 msgstr ""
 
-#: users/api/users.py:333
+#: users/api/users.py:356
 msgid "You can't see other users data downloads."
 msgstr ""
 
-#: users/apps.py:30
+#: users/apps.py:33
 msgid "Edit details"
 msgstr "Редактировать детали"
 
-#: users/apps.py:36
+#: users/apps.py:39
 msgid "Change username"
 msgstr "Изменить имя пользователя"
 
-#: users/apps.py:42
+#: users/apps.py:46
 msgid "Change email or password"
 msgstr "Изменить email или пароль"
 
-#: users/apps.py:63
+#: users/apps.py:71
 msgid "Delete account"
 msgstr ""
 
@@ -7620,7 +7722,7 @@ msgstr "Введеный e-mail недействителен."
 msgid "No user with this e-mail exists."
 msgstr "Пользователей с данным e-mail не существует."
 
-#: users/forms/auth.py:150 users/views/activation.py:45
+#: users/forms/auth.py:150 users/views/activation.py:51
 #, python-format
 msgid "%(user)s, your account is already active."
 msgstr "%(user)s, Ваш аккаунт уже активен."
@@ -7650,10 +7752,6 @@ msgstr ""
 msgid "This usernane is not allowed."
 msgstr "Это имя пользователя недоступно."
 
-#: users/forms/register.py:45 users/validators.py:51
-msgid "This e-mail address is not allowed."
-msgstr "Этот e-mail адрес недоступен."
-
 #: users/forms/register.py:51
 msgid "This agreement is required."
 msgstr ""
@@ -8182,10 +8280,6 @@ msgstr "Данный e-mail адрес недоступен."
 msgid "This username is not available."
 msgstr "Данное имя пользователя недоступно."
 
-#: users/validators.py:79
-msgid "This username is not allowed."
-msgstr "Данное имя пользователя запрещено."
-
 #: users/validators.py:85
 msgid "Username can only contain latin alphabet letters and digits."
 msgstr "Имя пользователя может содержать только латинские буквы и цифры."
@@ -8224,7 +8318,11 @@ msgstr "Введенные данные были найдены в базе да
 msgid "This email is not allowed."
 msgstr "Данный e-mail запрещен."
 
-#: users/views/activation.py:50
+#: users/views/activation.py:21
+msgid "Please use the 3rd party site to activate your account."
+msgstr ""
+
+#: users/views/activation.py:56
 #, python-format
 msgid ""
 "%(user)s, your activation link is invalid. Try again or request new "
@@ -8233,12 +8331,16 @@ msgstr ""
 "%(user)s, ваша ссылка активации недействительна. Попробуйте еще раз или "
 "запросите новую ссылку активации."
 
-#: users/views/activation.py:68
+#: users/views/activation.py:74
 #, python-format
 msgid "%(user)s, your account has been activated!"
 msgstr "%(user)s, Ваш аккаунт был активирован."
 
-#: users/views/forgottenpassword.py:39
+#: users/views/forgottenpassword.py:18 users/views/options.py:70
+msgid "Please use the 3rd party site to change password."
+msgstr ""
+
+#: users/views/forgottenpassword.py:45
 #, python-format
 msgid ""
 "%(user)s, your link has expired. Please request new link and try again."
@@ -8246,19 +8348,23 @@ msgstr ""
 "%(user)s, Ваша ссылка устарела. Пожалуйста, запросите новую и попробуйте еще"
 " раз."
 
-#: users/views/forgottenpassword.py:46
+#: users/views/forgottenpassword.py:52
 #, python-format
 msgid "%(user)s, your link is invalid. Please try again or request new link."
 msgstr ""
 "%(user)s, Ваша ссылка недействительна. Пожалуйста, попробуйте снова или "
 "запросите новую ссылку."
 
-#: users/views/options.py:55
+#: users/views/options.py:47
+msgid "Please use the 3rd party site to change e-mail."
+msgstr ""
+
+#: users/views/options.py:59
 #, python-format
 msgid "%(user)s, your e-mail has been changed."
 msgstr "%(user)s, Ваш e-mail был изменен."
 
-#: users/views/options.py:73
+#: users/views/options.py:80
 #, python-format
 msgid "%(user)s, your password has been changed."
 msgstr "%(user)s, Ваш пароль был изменен."

BIN
misago/locale/ru/LC_MESSAGES/djangojs.mo


+ 33 - 28
misago/locale/ru/LC_MESSAGES/djangojs.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-06 13:05+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: Katrin Kutepova <blackkatelv@gmail.com>, 2018\n"
 "Language-Team: Russian (https://www.transifex.com/misago/teams/65369/ru/)\n"
@@ -109,7 +109,7 @@ msgstr "Добавление пользователя"
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:13
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:17
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -294,6 +294,10 @@ msgid "Edit details"
 msgstr "Редактировать детали"
 
 #: static/misago/js/misago.js:2
+msgid "Insert spoiler"
+msgstr ""
+
+#: static/misago/js/misago.js:2
 msgid "Enter name of syntax of your code (optional)"
 msgstr "Введите язык для подсветки синтаксиса (опционально)"
 
@@ -301,7 +305,7 @@ msgstr "Введите язык для подсветки синтаксиса (
 msgid "Insert code"
 msgstr "Вставить код"
 
-#: static/misago/js/misago.js:2
+#: static/misago/js/misago.js:3
 msgid "Emphase selection"
 msgstr "Акцентировать выделенное"
 
@@ -410,7 +414,7 @@ msgstr "(ошибка)"
 msgid "(success)"
 msgstr "(успешно)"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:10
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:11
 #: static/misago/js/misago.js:17
 msgid "Best answer"
 msgstr ""
@@ -471,7 +475,8 @@ msgstr "Опубликовано %(poster)s%(posted_on)sв категории \"
 msgid "%(title)s, joined on %(joined_on)s"
 msgstr "%(title)s, присоединился %(joined_on)s"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:13
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
+#: static/misago/js/misago.js:13
 msgid "Change username"
 msgstr "Изменить имя"
 
@@ -512,12 +517,11 @@ msgstr "Вашено новое имя совпадает с текущим."
 msgid "New username"
 msgstr "Новое имя"
 
-#: static/misago/js/misago.js:4
+#: static/misago/js/misago.js:5
 msgid "Your username has been changed successfully."
 msgstr "Имя было успешно изменено."
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change your options"
 msgstr "Измените ваши настройки"
 
@@ -923,11 +927,11 @@ msgstr "Сообщение с голосованием"
 msgid "Posted by %(poster)s %(posted_on)s."
 msgstr "Опубликовал  %(poster)s  %(posted_on)s."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "Voting ends %(ends_on)s."
 msgstr "Голосование закончится  %(ends_on)s."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "%(votes)s vote."
 msgid_plural "%(votes)s votes."
 msgstr[0] "%(votes)sголос."
@@ -985,6 +989,7 @@ msgstr ""
 
 #: static/misago/js/misago.js:7 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
+#: static/misago/js/misago.js:17
 msgid "Delete"
 msgstr "Удалить"
 
@@ -1024,11 +1029,11 @@ msgstr "Сохранить ваш голос"
 msgid "See results"
 msgstr "Посмотреть результаты"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert post to state from before this edit."
 msgstr "Отменить изменения и вернуть состояние до редактирования."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert"
 msgstr "Отменить"
 
@@ -1047,7 +1052,7 @@ msgstr ""
 msgid "Post has been reverted to previous state."
 msgstr "Сообщение было возвращено в предыдущее состояние"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "See previous change"
 msgstr "Посмотреть предыдущее изменение"
 
@@ -1151,7 +1156,7 @@ msgstr "Заголовок темы"
 msgid "Post thread"
 msgstr "Опубликовать тему"
 
-#: static/misago/js/misago.js:8
+#: static/misago/js/misago.js:9
 msgid "Are you sure you want to discard thread?"
 msgstr "Вы уверены что хотите удалить ветку?"
 
@@ -1270,7 +1275,7 @@ msgstr[3] ""
 "%(show_value)s)."
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:10
-#: static/misago/js/misago.js:16
+#: static/misago/js/misago.js:16 static/misago/js/misago.js:17
 msgid "Hide"
 msgstr "Спрятать"
 
@@ -1376,13 +1381,13 @@ msgstr "Скрыл %(hidden_by)s%(hidden_on)s."
 msgid "This post is hidden. You cannot see its contents."
 msgstr "Это сообщение скрыто. Содержимое недоступно."
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid ""
 "Are you sure you want to delete this post? This action is not reversible!"
 msgstr ""
 "Вы уверены, что хотите удалить это сообщение? Это действие необратимо."
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid "Post has been deleted."
 msgstr "Сообщение удалено."
 
@@ -1948,7 +1953,8 @@ msgstr "Новые регистрации сейчас отключены."
 msgid "Registration is currently unavailable due to an error."
 msgstr "Регистрация недоступна из-за ошибки."
 
-#: static/misago/js/misago.js:13 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:13 static/misago/js/misago.js:14
+#: static/misago/js/misago.js:20
 msgid "Register"
 msgstr "Регистрация"
 
@@ -2178,7 +2184,7 @@ msgid ""
 msgstr ""
 "Вы уверены, что хотите удалить выбранные сообщения? Это действие необратимо!"
 
-#: static/misago/js/misago.js:15
+#: static/misago/js/misago.js:16
 msgid ""
 "Are you sure you want to delete selected posts? This action is not "
 "reversible!"
@@ -2510,13 +2516,13 @@ msgstr "Модерация тем"
 msgid "One or more threads could not be deleted:"
 msgstr "Одна или более тем не могут быть удалены:"
 
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid ""
 "You can't move threads because there are no categories you are allowed to "
 "move them to."
 msgstr ""
 
-#: static/misago/js/misago.js:19
+#: static/misago/js/misago.js:20
 msgid ""
 "You need permission to start threads in category to be able to merge threads"
 " to it."
@@ -2588,16 +2594,15 @@ msgstr "Вы просматриваете как гость."
 msgid "Sign in or register to start and participate in discussions."
 msgstr "Войдите или зарегистрируйтесь, чтобы участвовать в обсуждениях."
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "You have unread private threads!"
 msgstr ""
 
-#: static/misago/js/misago.js:20 static/misago/js/misago.js:21
-#: static/misago/js/misago.js:23
+#: static/misago/js/misago.js:21 static/misago/js/misago.js:23
 msgid "Private threads"
 msgstr "Приватные темы"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "Are you sure you want to sign out?"
 msgstr "Вы уверены что хотите выйти?"
 
@@ -2677,11 +2682,11 @@ msgstr[3] "%(followers)sпоследователей"
 msgid "No users have posted any new messages during last %(days)s days."
 msgstr ""
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Rank"
 msgstr "Ранг"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Ranked posts"
 msgstr "Рейтинг сообщений"
 
@@ -2777,7 +2782,7 @@ msgstr ""
 msgid "You are already working on a poll. Do you want to discard it?"
 msgstr ""
 
-#: static/misago/js/misago.js:24
+#: static/misago/js/misago.js:25
 msgid "You don't have permission to perform this action."
 msgstr "У Вас нет прав для совершения этого действия."
 

BIN
misago/locale/tr/LC_MESSAGES/django.mo


+ 202 - 96
misago/locale/tr/LC_MESSAGES/django.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-07 17:33+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: bedirhan doğan yılmaz <bedirhandoganyilmaz@gmail.com>, 2018\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/misago/teams/65369/tr_TR/)\n"
@@ -216,22 +216,21 @@ msgstr "Kapalı bölüm"
 msgid "Only members with valid permissions can post in closed categories."
 msgstr "Sadece geçerli izni olan üyeler kapalı kategorilerde ileti yapabilir."
 
-#: categories/admin/forms.py:70 conf/admin/__init__.py:79
+#: categories/admin/forms.py:70 conf/admin/__init__.py:93
 #: templates/misago/admin/categories/list.html:19
 #: templates/misago/admin/dashboard/totals.html:19
 #: templates/misago/navbar.html:20 templates/misago/navbar.html:36
 #: templates/misago/profile/threads.html:5
 #: templates/misago/profile/threads.html:8
 #: templates/misago/profile/threads.html:9
-#: templates/misago/threadslist/category.html:74
+#: templates/misago/threadslist/category.html:68
 #: templates/misago/threadslist/threads.html:14
 #: templates/misago/threadslist/threads.html:16
-#: templates/misago/threadslist/threads.html:18
-#: templates/misago/threadslist/threads.html:35
-#: templates/misago/threadslist/threads.html:44
-#: templates/misago/threadslist/threads.html:63
+#: templates/misago/threadslist/threads.html:33
+#: templates/misago/threadslist/threads.html:42
+#: templates/misago/threadslist/threads.html:66
 #: threads/permissions/threads.py:73 threads/permissions/threads.py:104
-#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:98
+#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:106
 msgid "Threads"
 msgstr "Konular"
 
@@ -462,20 +461,20 @@ msgstr "bölüm içeriği görülüyor"
 msgid "You don't have permission to browse \"%(category)s\" contents."
 msgstr "%(category)s bölüm içeriklerini göz atmaya izniniz bulunmamaktadır."
 
-#: conf/admin/__init__.py:41 templates/misago/admin/conf/index.html:5
+#: conf/admin/__init__.py:45 templates/misago/admin/conf/index.html:5
 #: templates/misago/admin/themes/form.html:48
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: conf/admin/__init__.py:48 templates/misago/admin/socialauth/form.html:27
+#: conf/admin/__init__.py:52 templates/misago/admin/socialauth/form.html:27
 msgid "General"
 msgstr "Genel"
 
-#: conf/admin/__init__.py:49
+#: conf/admin/__init__.py:53
 msgid "Change forum details like name, description or footer."
 msgstr ""
 
-#: conf/admin/__init__.py:54 templates/misago/admin/dashboard/totals.html:7
+#: conf/admin/__init__.py:58 templates/misago/admin/dashboard/totals.html:7
 #: templates/misago/admin/users/ban.html:22 templates/misago/navbar.html:42
 #: templates/misago/userslists/base.html:5
 #: templates/misago/userslists/base.html:14 users/admin/__init__.py:74
@@ -483,28 +482,38 @@ msgstr ""
 msgid "Users"
 msgstr "Kullanicilar"
 
-#: conf/admin/__init__.py:56
+#: conf/admin/__init__.py:60
 msgid "Customize user accounts default behavior and features availability."
 msgstr ""
 
-#: conf/admin/__init__.py:63
+#: conf/admin/__init__.py:67
 msgid "Captcha"
 msgstr ""
 
-#: conf/admin/__init__.py:65
+#: conf/admin/__init__.py:69
 msgid "Setup protection against automatic registrations on the site."
 msgstr ""
 
-#: conf/admin/__init__.py:72 templates/misago/admin/dashboard/analytics.html:7
+#: conf/admin/__init__.py:76
+msgid "Single Sign-On"
+msgstr ""
+
+#: conf/admin/__init__.py:78
+msgid ""
+"SSO enables you to delegate user login and registration from Misago tothe "
+"third party site."
+msgstr ""
+
+#: conf/admin/__init__.py:86 templates/misago/admin/dashboard/analytics.html:7
 #: templates/misago/admin/dashboard/index.html:40
 msgid "Analytics"
 msgstr ""
 
-#: conf/admin/__init__.py:73
+#: conf/admin/__init__.py:87
 msgid "Enable Google Analytics or setup Google Site Verification."
 msgstr ""
 
-#: conf/admin/__init__.py:80
+#: conf/admin/__init__.py:94
 msgid "Threads, posts, polls and attachments options."
 msgstr ""
 
@@ -742,6 +751,39 @@ msgid ""
 "Address under which site is running appears to be \"%(address)s\"."
 msgstr ""
 
+#: conf/admin/forms/sso.py:13
+msgid "Enable Single Sign-On"
+msgstr ""
+
+#: conf/admin/forms/sso.py:15
+msgid ""
+"Enabling SSO will make login option redirect users to the server URL "
+"configured below. It will also disable option to register on forum, change "
+"username, email or passward, as those features will be delegated to the 3rd "
+"party site."
+msgstr ""
+
+#: conf/admin/forms/sso.py:22
+msgid "Public key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:24 conf/admin/forms/sso.py:32
+msgid ""
+"Leave this field empty for Misago to generate this key on form submission."
+msgstr ""
+
+#: conf/admin/forms/sso.py:30
+msgid "Private key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:37
+msgid "Server URL"
+msgstr ""
+
+#: conf/admin/forms/sso.py:50
+msgid "You need to enter server URL to enable SSO."
+msgstr ""
+
 #: conf/admin/forms/threads.py:27
 msgid "Daily post limit per user"
 msgstr ""
@@ -1053,7 +1095,7 @@ msgstr ""
 msgid "This value must be lower than number of users per page."
 msgstr ""
 
-#: conf/admin/views.py:39
+#: conf/admin/views.py:40
 msgid "Settings have been saved."
 msgstr ""
 
@@ -1103,11 +1145,6 @@ msgstr "Bu işlem ziyaretçiler için uygun değildir."
 #: core/templatetags/misago_pagetitle.py:10
 #: templates/misago/thread/private_thread.html:7
 #: templates/misago/thread/thread.html:7
-#: templates/misago/threadslist/category.html:8
-#: templates/misago/threadslist/category.html:13
-#: templates/misago/threadslist/private_threads.html:8
-#: templates/misago/threadslist/private_threads.html:13
-#: templates/misago/threadslist/threads.html:16
 #, python-format
 msgid "page: %(page)s"
 msgstr "sayfa:%(page)s"
@@ -1335,15 +1372,28 @@ msgstr "Servis koşullari"
 msgid "Privacy policy"
 msgstr "Gizlilik ilke"
 
-#: markup/finalise.py:20
+#: markup/finalize.py:24
 #, python-format
 msgid "%(title)s has written:"
 msgstr "%(title)syazıldı:"
 
-#: markup/finalise.py:22
+#: markup/finalize.py:26
 msgid "Quoted message:"
 msgstr "Alıntı ileti:"
 
+#: markup/finalize.py:33
+#, python-format
+msgid "%(title)s:"
+msgstr ""
+
+#: markup/finalize.py:35
+msgid "Spoiler:"
+msgstr ""
+
+#: markup/finalize.py:40
+msgid "Reveal spoiler"
+msgstr ""
+
 #: search/api.py:17 search/views.py:12 search/views.py:21
 msgid "You don't have permission to search site."
 msgstr "Sitede arama iznin yok"
@@ -1460,6 +1510,18 @@ msgstr ""
 msgid "Please try resubmitting the form."
 msgstr "Lütfen formu tekrar deneyin."
 
+#: socialauth/views.py:23
+msgid "Please use the 3rd party site to login."
+msgstr ""
+
+#: sso/validators.py:24 users/validators.py:79
+msgid "This username is not allowed."
+msgstr "Bu kullanıcı adına izin verilmiyor."
+
+#: sso/validators.py:33 users/forms/register.py:45 users/validators.py:51
+msgid "This e-mail address is not allowed."
+msgstr "Bu e-posta adresine izin verilmiyor."
+
 #: templates/misago/acl_debug.html:5
 #, python-format
 msgid ""
@@ -1890,7 +1952,7 @@ msgstr "bölüm"
 #: templates/misago/admin/dashboard/totals.html:31
 #: templates/misago/admin/users/list.html:21
 #: templates/misago/profile/posts.html:5 templates/misago/profile/posts.html:8
-#: templates/misago/profile/posts.html:9 users/apps.py:94
+#: templates/misago/profile/posts.html:9 users/apps.py:102
 msgid "Posts"
 msgstr "iletiler"
 
@@ -2032,45 +2094,56 @@ msgstr ""
 msgid "Attachment error images"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:8
+#: templates/misago/admin/conf/users_settings.html:9
+#: templates/misago/admin/socialauth/list.html:97
+msgid "Note"
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:9
+msgid ""
+"Single Sign-On is enabled. Site's registration, password and deletion "
+"features have been disabled and delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:14
 msgid "New accounts"
 msgstr "Yeni hesaplar"
 
-#: templates/misago/admin/conf/users_settings.html:17 users/admin/forms.py:484
+#: templates/misago/admin/conf/users_settings.html:23 users/admin/forms.py:484
 #: users/admin/forms.py:573
 msgid "Usernames"
 msgstr "Kullanıcı adları"
 
-#: templates/misago/admin/conf/users_settings.html:27
+#: templates/misago/admin/conf/users_settings.html:33
 msgid "Avatars"
 msgstr "Avatarlar"
 
-#: templates/misago/admin/conf/users_settings.html:43
+#: templates/misago/admin/conf/users_settings.html:49
 msgid "Signatures"
 msgstr "İmzalar"
 
-#: templates/misago/admin/conf/users_settings.html:51
+#: templates/misago/admin/conf/users_settings.html:57
 #: users/admin/__init__.py:80
 msgid "Data downloads"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:60
+#: templates/misago/admin/conf/users_settings.html:66
 msgid "Own account deletion"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:68 users/admin/forms.py:492
+#: templates/misago/admin/conf/users_settings.html:74 users/admin/forms.py:492
 msgid "IP addresses"
 msgstr "IP adresleri"
 
-#: templates/misago/admin/conf/users_settings.html:76
+#: templates/misago/admin/conf/users_settings.html:82
 msgid "Default subscription preferences"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:85
+#: templates/misago/admin/conf/users_settings.html:91
 msgid "Users lists"
 msgstr ""
 
-#: templates/misago/admin/conf/users_settings.html:94
+#: templates/misago/admin/conf/users_settings.html:100
 msgid "Top posters ranking"
 msgstr ""
 
@@ -2590,7 +2663,7 @@ msgid "Enabled login methods"
 msgstr ""
 
 #: templates/misago/admin/socialauth/list.html:15
-#: templates/misago/admin/socialauth/list.html:106
+#: templates/misago/admin/socialauth/list.html:112
 msgid "Provider"
 msgstr ""
 
@@ -2606,19 +2679,25 @@ msgstr ""
 msgid "Are you sure you want to disable this social login provider?"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:100
+#: templates/misago/admin/socialauth/list.html:97
+msgid ""
+"Single Sign-On is enabled. Social authentication has been disabled and "
+"delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/socialauth/list.html:106
 msgid "Setup new login method"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:119
+#: templates/misago/admin/socialauth/list.html:125
 msgid "Setup login with this provider"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:120
+#: templates/misago/admin/socialauth/list.html:126
 msgid "Setup"
 msgstr ""
 
-#: templates/misago/admin/socialauth/list.html:127
+#: templates/misago/admin/socialauth/list.html:133
 msgid "No new login providers are available for setup at this time."
 msgstr ""
 
@@ -2916,7 +2995,7 @@ msgstr ""
 msgid "Signature"
 msgstr "İmza"
 
-#: templates/misago/admin/users/edit.html:228 users/apps.py:24
+#: templates/misago/admin/users/edit.html:228 users/apps.py:27
 msgid "Forum options"
 msgstr "Forum ayarları"
 
@@ -3178,7 +3257,7 @@ msgid ""
 "download."
 msgstr ""
 
-#: templates/misago/emails/data_download.html:11 users/apps.py:52
+#: templates/misago/emails/data_download.html:11 users/apps.py:57
 msgid "Download data"
 msgstr ""
 
@@ -3595,7 +3674,7 @@ msgstr "Sonuçlara bak"
 #: templates/misago/profile/ban_details.html:5
 #: templates/misago/profile/ban_details.html:8
 #: templates/misago/profile/ban_details.html:9
-#: templates/misago/profile/ban_details.html:16 users/apps.py:129
+#: templates/misago/profile/ban_details.html:16 users/apps.py:137
 msgid "Ban details"
 msgstr "Yasaklamak ayrıntıları"
 
@@ -3644,7 +3723,7 @@ msgstr[1] "%(threads)s dizilerini başlattı."
 #: templates/misago/profile/details.html:5
 #: templates/misago/profile/details.html:8
 #: templates/misago/profile/details.html:9
-#: templates/misago/profile/details.html:19 users/apps.py:116
+#: templates/misago/profile/details.html:19 users/apps.py:124
 msgid "Details"
 msgstr "ayrıntılar"
 
@@ -3673,7 +3752,7 @@ msgstr "Bu hata, geçersiz ileti içeriği manipülasyonundan kaynaklanmaktadır
 
 #: templates/misago/profile/followers.html:5
 #: templates/misago/profile/followers.html:8
-#: templates/misago/profile/followers.html:9 users/apps.py:104
+#: templates/misago/profile/followers.html:9 users/apps.py:112
 msgid "Followers"
 msgstr "Takipçiler"
 
@@ -3702,7 +3781,7 @@ msgstr "%(username)sTakipçisi yok."
 
 #: templates/misago/profile/follows.html:5
 #: templates/misago/profile/follows.html:8
-#: templates/misago/profile/follows.html:9 users/apps.py:110
+#: templates/misago/profile/follows.html:9 users/apps.py:118
 msgid "Follows"
 msgstr "Şöyledir"
 
@@ -3790,7 +3869,7 @@ msgstr "%(username)sKonu başlatılmamış."
 
 #: templates/misago/profile/username_history.html:5
 #: templates/misago/profile/username_history.html:8
-#: templates/misago/profile/username_history.html:9 users/apps.py:122
+#: templates/misago/profile/username_history.html:9 users/apps.py:130
 msgid "Username history"
 msgstr "Kullanıcı adı geçmişi"
 
@@ -4107,29 +4186,29 @@ msgstr ""
 msgid "Best answer"
 msgstr ""
 
-#: templates/misago/threadslist/base.html:58
+#: templates/misago/threadslist/base.html:57
 msgid "There are no threads in this category."
 msgstr "Bu bölüm de konu yok."
 
-#: templates/misago/threadslist/base.html:60
+#: templates/misago/threadslist/base.html:59
 msgid "There are no threads on this forum... yet!"
 msgstr "Bu forumda konu yok ... Henüz!"
 
-#: templates/misago/threadslist/base.html:64
-#: templates/misago/threadslist/private_threads.html:67
+#: templates/misago/threadslist/base.html:63
+#: templates/misago/threadslist/private_threads.html:61
 msgid "Why not start one yourself?"
 msgstr "Neden kendiniz başlatmıyorsunuz?"
 
-#: templates/misago/threadslist/base.html:68
-#: templates/misago/threadslist/private_threads.html:70
+#: templates/misago/threadslist/base.html:67
+#: templates/misago/threadslist/private_threads.html:64
 msgid "No threads matching specified criteria were found."
 msgstr "Belirtilen kriterlere uyan herhangi bir konu bulunamadı."
 
-#: templates/misago/threadslist/base.html:83
+#: templates/misago/threadslist/base.html:82
 msgid "Next page"
 msgstr "Sonraki Sayfa"
 
-#: templates/misago/threadslist/private_threads.html:48
+#: templates/misago/threadslist/private_threads.html:42
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
@@ -4137,7 +4216,7 @@ msgstr ""
 "Özel Konular, yalnızca kendilerine başlayan ve davet ettikleri kişilerin "
 "görebileceği ve katılabilecekleri iş parçacıklarıdır."
 
-#: templates/misago/threadslist/private_threads.html:64
+#: templates/misago/threadslist/private_threads.html:58
 msgid "You aren't participating in any private threads."
 msgstr "Özel konulara katılamazsın."
 
@@ -4171,7 +4250,7 @@ msgstr "Anket"
 
 #: templates/misago/userslists/active_posters.html:5
 #: templates/misago/userslists/active_posters.html:23
-#: templates/misago/userslists/active_posters.html:24 users/apps.py:73
+#: templates/misago/userslists/active_posters.html:24 users/apps.py:81
 msgid "Top posters"
 msgstr ""
 
@@ -5343,10 +5422,8 @@ msgid "Can add everyone to threads"
 msgstr "Herkesi konu ekleyebilir"
 
 #: threads/permissions/privatethreads.py:46
-msgid "Allows user to add users that are blocking him to private threads."
+msgid "Allows user to add users that are blocking them to private threads."
 msgstr ""
-"Kullanıcının, onu özel iletilere engelleyen kullanıcıları eklemesine izin "
-"verir."
 
 #: threads/permissions/privatethreads.py:50
 msgid "Can report private threads"
@@ -7171,21 +7248,26 @@ msgstr "Yeni kullanıcı \"%(user)s\" kaydedildi."
 msgid "User \"%(user)s\" has been edited."
 msgstr "Kullanıcı \"%(user)s\" düzenlendi."
 
-#: users/api/auth.py:94
+#: users/api/auth.py:42 users/api/auth.py:92 users/api/auth.py:130
+#: users/api/auth.py:174
+msgid "Please use the 3rd party site to authenticate."
+msgstr ""
+
+#: users/api/auth.py:100
 #, python-format
 msgid "Activate %(user)s account on %(forum_name)s forums"
 msgstr "%(user)s hesabını %(forum_name)s forumlarında etkinleştir"
 
-#: users/api/auth.py:129
+#: users/api/auth.py:138
 #, python-format
 msgid "Change %(user)s password on %(forum_name)s forums"
 msgstr "%(user)s 'un şifresini %(forum_name)s forumlarında değiştir"
 
-#: users/api/auth.py:164
+#: users/api/auth.py:176
 msgid "Form link is invalid. Please try again."
 msgstr "Form bağlantısı geçersiz. Lütfen tekrar deneyin."
 
-#: users/api/auth.py:165
+#: users/api/auth.py:177
 msgid "Your link has expired. Please request new one."
 msgstr "Bağlantınızın süresi doldu. Lütfen yeni bir tane talep edin."
 
@@ -7288,63 +7370,83 @@ msgstr "Diğer kullanıcıların ad geçmişini izlemek için izniniz yok."
 msgid "You have to sign in to perform this action."
 msgstr "Bu işlemi gerçekleştirmek için oturum açmanız gerekir."
 
-#: users/api/users.py:109
+#: users/api/users.py:89
+msgid "Please use the 3rd party site to register."
+msgstr ""
+
+#: users/api/users.py:112
 msgid "You can't change other users avatars."
 msgstr "Diğer avatarları değiştiremezsiniz."
 
-#: users/api/users.py:121
+#: users/api/users.py:124
 msgid "You can't change other users options."
 msgstr "Diğer kullanıcı seçeneklerini değiştiremezsiniz."
 
-#: users/api/users.py:126
+#: users/api/users.py:129
 msgid "Your forum options have been changed."
 msgstr "Forum seçenekleriniz değiştirildi."
 
-#: users/api/users.py:132
+#: users/api/users.py:136
+msgid "Please use the 3rd party site to change your username."
+msgstr ""
+
+#: users/api/users.py:140
 msgid "You can't change other users names."
 msgstr "Diğer kullanıcı adlarını değiştiremezsiniz."
 
-#: users/api/users.py:139
+#: users/api/users.py:147
 msgid "You can't change other users signatures."
 msgstr "Diğer kullanıcı imzalarını değiştiremezsiniz."
 
-#: users/api/users.py:151
+#: users/api/users.py:160
+msgid "Please use the 3rd party site to change your password."
+msgstr ""
+
+#: users/api/users.py:164
 msgid "You can't change other users passwords."
 msgstr "Diğer kullanıcıların şifrelerini değiştiremezsiniz."
 
-#: users/api/users.py:161
+#: users/api/users.py:174
+msgid "Please use the 3rd party site to change your e-mail."
+msgstr ""
+
+#: users/api/users.py:179
 msgid "You can't change other users e-mail addresses."
 msgstr "Diğer kullanıcıların e-posta adreslerini değiştiremezsiniz."
 
-#: users/api/users.py:268
+#: users/api/users.py:210
+msgid "Please use the 3rd party site to delete account."
+msgstr ""
+
+#: users/api/users.py:291
 msgid "You can't request data downloads for other users."
 msgstr ""
 
-#: users/api/users.py:272
+#: users/api/users.py:295
 msgid "You can't download your data."
 msgstr ""
 
-#: users/api/users.py:277
+#: users/api/users.py:300
 msgid "You can't have more than one data download request at a single time."
 msgstr ""
 
-#: users/api/users.py:333
+#: users/api/users.py:356
 msgid "You can't see other users data downloads."
 msgstr ""
 
-#: users/apps.py:30
+#: users/apps.py:33
 msgid "Edit details"
 msgstr "Detayları düzenle"
 
-#: users/apps.py:36
+#: users/apps.py:39
 msgid "Change username"
 msgstr "Kullanıcı adını değiştir"
 
-#: users/apps.py:42
+#: users/apps.py:46
 msgid "Change email or password"
 msgstr "E-posta veya şifre değiştir"
 
-#: users/apps.py:63
+#: users/apps.py:71
 msgid "Delete account"
 msgstr ""
 
@@ -7423,7 +7525,7 @@ msgstr "Email adresini gir."
 msgid "No user with this e-mail exists."
 msgstr "Bu e-postayla hiçbir kullanıcı mevcut değil."
 
-#: users/forms/auth.py:150 users/views/activation.py:45
+#: users/forms/auth.py:150 users/views/activation.py:51
 #, python-format
 msgid "%(user)s, your account is already active."
 msgstr "%(user)s, hesabınız zaten aktif."
@@ -7449,10 +7551,6 @@ msgstr "Yönetici, yeni şifre isteyebilmek için hesabınızı etkinleştirmeli
 msgid "This usernane is not allowed."
 msgstr "Bu kullanıcı adına izin verilmiyor."
 
-#: users/forms/register.py:45 users/validators.py:51
-msgid "This e-mail address is not allowed."
-msgstr "Bu e-posta adresine izin verilmiyor."
-
 #: users/forms/register.py:51
 msgid "This agreement is required."
 msgstr ""
@@ -7962,10 +8060,6 @@ msgstr "Bu e-posta adresi mevcut değil."
 msgid "This username is not available."
 msgstr "Bu kullanıcı adı mevcut değil."
 
-#: users/validators.py:79
-msgid "This username is not allowed."
-msgstr "Bu kullanıcı adına izin verilmiyor."
-
 #: users/validators.py:85
 msgid "Username can only contain latin alphabet letters and digits."
 msgstr ""
@@ -7995,7 +8089,11 @@ msgstr "Girilen veriler spam verici veritabanında bulundu."
 msgid "This email is not allowed."
 msgstr "Bu e-postaya izin verilmiyor."
 
-#: users/views/activation.py:50
+#: users/views/activation.py:21
+msgid "Please use the 3rd party site to activate your account."
+msgstr ""
+
+#: users/views/activation.py:56
 #, python-format
 msgid ""
 "%(user)s, your activation link is invalid. Try again or request new "
@@ -8004,12 +8102,16 @@ msgstr ""
 "%(user)s, etkinleştirme bağlantınız geçersiz. Tekrar deneyin veya yeni "
 "etkinleştirme bağlantısı isteğinde bulunun."
 
-#: users/views/activation.py:68
+#: users/views/activation.py:74
 #, python-format
 msgid "%(user)s, your account has been activated!"
 msgstr "%(user)s, hesabınız aktive edildi!"
 
-#: users/views/forgottenpassword.py:39
+#: users/views/forgottenpassword.py:18 users/views/options.py:70
+msgid "Please use the 3rd party site to change password."
+msgstr ""
+
+#: users/views/forgottenpassword.py:45
 #, python-format
 msgid ""
 "%(user)s, your link has expired. Please request new link and try again."
@@ -8017,19 +8119,23 @@ msgstr ""
 "%(user)s, bağlantınızın süresi doldu. Lütfen yeni bağlantı isteğinde bulunup"
 " tekrar deneyin."
 
-#: users/views/forgottenpassword.py:46
+#: users/views/forgottenpassword.py:52
 #, python-format
 msgid "%(user)s, your link is invalid. Please try again or request new link."
 msgstr ""
 "%(user)s, bağlantınız geçersiz. Lütfen tekrar deneyin veya yeni bir bağlantı"
 " isteğinde bulunun."
 
-#: users/views/options.py:55
+#: users/views/options.py:47
+msgid "Please use the 3rd party site to change e-mail."
+msgstr ""
+
+#: users/views/options.py:59
 #, python-format
 msgid "%(user)s, your e-mail has been changed."
 msgstr "%(user)s, e-postanız değiştirildi."
 
-#: users/views/options.py:73
+#: users/views/options.py:80
 #, python-format
 msgid "%(user)s, your password has been changed."
 msgstr "%(user)s, Şifreniz değiştirildi."

BIN
misago/locale/tr/LC_MESSAGES/djangojs.mo


+ 33 - 28
misago/locale/tr/LC_MESSAGES/djangojs.po

@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-06 13:05+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: gülce abatay <gulceabatay@gmail.com>, 2018\n"
 "Language-Team: Turkish (Turkey) (https://www.transifex.com/misago/teams/65369/tr_TR/)\n"
@@ -111,7 +111,7 @@ msgstr "Eklenecek kullanıcı"
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:13
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:17
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid "Cancel"
 msgstr "İptal et"
 
@@ -295,6 +295,10 @@ msgid "Edit details"
 msgstr "Ayrıntıları düzenle"
 
 #: static/misago/js/misago.js:2
+msgid "Insert spoiler"
+msgstr ""
+
+#: static/misago/js/misago.js:2
 msgid "Enter name of syntax of your code (optional)"
 msgstr "Kodunuzun sözdiziminin adını girin (isteğe bağlı) "
 
@@ -302,7 +306,7 @@ msgstr "Kodunuzun sözdiziminin adını girin (isteğe bağlı) "
 msgid "Insert code"
 msgstr "Kod ekle"
 
-#: static/misago/js/misago.js:2
+#: static/misago/js/misago.js:3
 msgid "Emphase selection"
 msgstr "Vurgu seçimi"
 
@@ -413,7 +417,7 @@ msgstr "(hata)"
 msgid "(success)"
 msgstr "(başarılı)"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:10
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:11
 #: static/misago/js/misago.js:17
 msgid "Best answer"
 msgstr ""
@@ -469,7 +473,8 @@ msgstr ""
 msgid "%(title)s, joined on %(joined_on)s"
 msgstr "%(title)s, %(joined_on)s'da katıldı."
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:13
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
+#: static/misago/js/misago.js:13
 msgid "Change username"
 msgstr "Kullanıcı adını değiştir"
 
@@ -510,12 +515,11 @@ msgstr "Kullanici ismin şuankiyle ayni."
 msgid "New username"
 msgstr "Yeni kullanıcı adı"
 
-#: static/misago/js/misago.js:4
+#: static/misago/js/misago.js:5
 msgid "Your username has been changed successfully."
 msgstr "Kullanıcı adin başarıyla değiştirildi."
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change your options"
 msgstr "Seçeneklerini değiştir"
 
@@ -921,11 +925,11 @@ msgstr "Anket yayımla"
 msgid "Posted by %(poster)s %(posted_on)s."
 msgstr "%(poster)s tarafından, %(posted_on)s tarihinde yayımlandı."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "Voting ends %(ends_on)s."
 msgstr "Oylama %(ends_on)s tarihinde sonlanır."
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "%(votes)s vote."
 msgid_plural "%(votes)s votes."
 msgstr[0] "%(votes)s oy."
@@ -975,6 +979,7 @@ msgstr "Bu anketi silmek istediğinizden emin misiniz? Bu eylem geri alınamaz."
 
 #: static/misago/js/misago.js:7 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
+#: static/misago/js/misago.js:17
 msgid "Delete"
 msgstr "Silmek"
 
@@ -1012,11 +1017,11 @@ msgstr "Oyunuzu kaydedin"
 msgid "See results"
 msgstr "Sonuçlara bak"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert post to state from before this edit."
 msgstr "İleti bu düzenlemeden önceki haline döner."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert"
 msgstr "Geriye almak"
 
@@ -1034,7 +1039,7 @@ msgstr "Bu ileti düzenlemeden önceki haline döner emin misiniz?"
 msgid "Post has been reverted to previous state."
 msgstr "İleti önceki duruma döndü."
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "See previous change"
 msgstr "Önceki değişikliği gör"
 
@@ -1135,7 +1140,7 @@ msgstr "Konu başlığı"
 msgid "Post thread"
 msgstr "Konu Aç"
 
-#: static/misago/js/misago.js:8
+#: static/misago/js/misago.js:9
 msgid "Are you sure you want to discard thread?"
 msgstr "Konuyu silmek istediğinden emin misin?"
 
@@ -1230,7 +1235,7 @@ msgstr[1] ""
 "karakterdir)"
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:10
-#: static/misago/js/misago.js:16
+#: static/misago/js/misago.js:16 static/misago/js/misago.js:17
 msgid "Hide"
 msgstr "Gizle"
 
@@ -1336,13 +1341,13 @@ msgstr "%(hidden_by)s tarafından %(hidden_on)s tarihinde gizlendi."
 msgid "This post is hidden. You cannot see its contents."
 msgstr "Bu ileti gizli. İçeriğini göremezsiniz."
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid ""
 "Are you sure you want to delete this post? This action is not reversible!"
 msgstr ""
 "Bu ileti yi silmek istediğinizden emin misiniz? Bu eylem geri alınamaz!"
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid "Post has been deleted."
 msgstr "İleti silindi."
 
@@ -1883,7 +1888,8 @@ msgstr "Yeni kullanıcı kayıtları şu anda devde dışıdır."
 msgid "Registration is currently unavailable due to an error."
 msgstr "Kayıt şu anda bir hata nedeniyle kullanılamıyor."
 
-#: static/misago/js/misago.js:13 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:13 static/misago/js/misago.js:14
+#: static/misago/js/misago.js:20
 msgid "Register"
 msgstr "Kayıt Ol"
 
@@ -2118,7 +2124,7 @@ msgstr ""
 "Seçilen iletiler i birleştirmek istediğinizden emin misiniz? Bu eylem geri "
 "alınamaz!"
 
-#: static/misago/js/misago.js:15
+#: static/misago/js/misago.js:16
 msgid ""
 "Are you sure you want to delete selected posts? This action is not "
 "reversible!"
@@ -2453,14 +2459,14 @@ msgstr "Konular moderasyonu"
 msgid "One or more threads could not be deleted:"
 msgstr "Bir veya daha fazla konular silinemedi:"
 
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid ""
 "You can't move threads because there are no categories you are allowed to "
 "move them to."
 msgstr ""
 "Konular taşınamaz çünkü onları taşımanıza izin verilen kategori yoktur."
 
-#: static/misago/js/misago.js:19
+#: static/misago/js/misago.js:20
 msgid ""
 "You need permission to start threads in category to be able to merge threads"
 " to it."
@@ -2537,16 +2543,15 @@ msgid "Sign in or register to start and participate in discussions."
 msgstr ""
 "Tartışmaya katılmak ve tartışma başlatmak için oturum açın veya kayıt olun."
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "You have unread private threads!"
 msgstr ""
 
-#: static/misago/js/misago.js:20 static/misago/js/misago.js:21
-#: static/misago/js/misago.js:23
+#: static/misago/js/misago.js:21 static/misago/js/misago.js:23
 msgid "Private threads"
 msgstr "Özel Konular"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "Are you sure you want to sign out?"
 msgstr "Oturumu kapatmak istediğinizden emin misiniz?"
 
@@ -2624,11 +2629,11 @@ msgstr[1] "%(followers)s takipçiler"
 msgid "No users have posted any new messages during last %(days)s days."
 msgstr "Hiçbir kullanıcı son %(days)s gün içinde yeni mesaj göndermedi."
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Rank"
 msgstr "Rütbe"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Ranked posts"
 msgstr "Rütbeli iletiler"
 
@@ -2721,7 +2726,7 @@ msgstr "Zaten başka bir ileti üzerinde çalışıyoruz. Çöpe atmak ister mis
 msgid "You are already working on a poll. Do you want to discard it?"
 msgstr "Zaten bir anket üzerinde çalışıyorsun. Çöpe atmak ister misin?"
 
-#: static/misago/js/misago.js:24
+#: static/misago/js/misago.js:25
 msgid "You don't have permission to perform this action."
 msgstr "Bu eylemi gerçekleştirmek için iznin yok."
 

BIN
misago/locale/zh_Hans/LC_MESSAGES/django.mo


+ 813 - 705
misago/locale/zh_Hans/LC_MESSAGES/django.po

@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-12 20:20+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: 蚂蚁先生 <pzf_karl@hotmail.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/misago/teams/65369/zh_CN/)\n"
@@ -42,31 +42,31 @@ msgstr "请求的身份不存在。"
 
 #: acl/admin/views.py:51 categories/admin/views/perms.py:62
 msgid "Form contains errors."
-msgstr "表单存在错误。"
+msgstr "表单包含错误。"
 
 #: acl/admin/views.py:62 categories/admin/views/perms.py:73
 #, python-format
 msgid "New role \"%(name)s\" has been saved."
-msgstr "已保存新身份 \"%(name)s\" 。"
+msgstr "新身份 \"%(name)s\" 已经保存."
 
 #: acl/admin/views.py:66 categories/admin/views/perms.py:77
 #, python-format
 msgid "Role \"%(name)s\" has been changed."
-msgstr "已修改 “%(name)s” 身份。"
+msgstr "\"%(name)s\" 身份已修改."
 
 #: acl/admin/views.py:72 categories/admin/views/perms.py:83
 #, python-format
 msgid "Role \"%(name)s\" is special role and can't be deleted."
-msgstr "“%(name)s” 是特殊身份,不能被删除。"
+msgstr "\"%(name)s\" 是一个特殊身份,不能被删除。"
 
 #: acl/admin/views.py:77 categories/admin/views/perms.py:88
 #, python-format
 msgid "Role \"%(name)s\" has been deleted."
-msgstr "已删除 “%(name)s” 身份。"
+msgstr "\"%(name)s\" 身份已删除。"
 
 #: acl/migrations/0003_default_roles.py:10
 msgid "Member"
-msgstr "论坛成员"
+msgstr "成员"
 
 #: acl/migrations/0003_default_roles.py:48
 msgid "Guest"
@@ -81,20 +81,20 @@ msgstr "版主"
 
 #: acl/migrations/0003_default_roles.py:133
 msgid "Renaming users"
-msgstr "可重命名用户"
+msgstr "可重命名用户"
 
 #: acl/migrations/0003_default_roles.py:141
 msgid "Banning users"
-msgstr "可封禁用户"
+msgstr "可封禁用户"
 
 #: acl/migrations/0003_default_roles.py:155
 #: users/migrations/0004_default_ranks.py:33 users/permissions/delete.py:23
 msgid "Deleting users"
-msgstr "可删除用户"
+msgstr "可删除用户"
 
 #: acl/migrations/0003_default_roles.py:166
 msgid "Can't be blocked"
-msgstr "不可被屏蔽"
+msgstr "不可拉黑"
 
 #: acl/migrations/0003_default_roles.py:174
 #: threads/permissions/privatethreads.py:33
@@ -111,7 +111,7 @@ msgstr "隐蔽话题版主"
 
 #: acl/panels.py:8
 msgid "Misago User ACL"
-msgstr "Misago 用户访问控制表"
+msgstr "用户访问权限控制表"
 
 #: acl/panels.py:17
 msgid "Anonymous user"
@@ -124,7 +124,7 @@ msgstr "仪表盘"
 
 #: admin/auth.py:29
 msgid "Your admin session has expired."
-msgstr "管理会话已过期。"
+msgstr "管理会话已过期。"
 
 #: admin/forms.py:46
 msgid ""
@@ -154,7 +154,7 @@ msgstr "否"
 
 #: admin/views/auth.py:39
 msgid "Your admin session has been closed."
-msgstr "管理会话已关闭。"
+msgstr "管理会话已关闭。"
 
 #: admin/views/generic/list.py:39
 msgid "Selected: 0"
@@ -170,7 +170,7 @@ msgstr "你必须选择一个或者多个项目。"
 
 #: admin/views/generic/list.py:307
 msgid "Action is not allowed."
-msgstr "操作不被许可。"
+msgstr "非法操作。"
 
 #: categories/admin/__init__.py:65 templates/misago/categories/base.html:7
 #: templates/misago/categories/base.html:29
@@ -197,18 +197,18 @@ msgstr "描述"
 
 #: categories/admin/forms.py:52
 msgid "Optional description explaining category intented purpose."
-msgstr "解释版块用途(可选)。"
+msgstr "解释此版块的主要内容。(可选)。"
 
 #: categories/admin/forms.py:55 templates/misago/admin/categories/list.html:18
 #: templates/misago/admin/ranks/list.html:20 users/admin/forms.py:419
 msgid "CSS class"
-msgstr "CSS"
+msgstr "CSS class"
 
 #: categories/admin/forms.py:58
 msgid ""
 "Optional CSS class used to customize this category's appearance from "
 "templates."
-msgstr "用于个性化版块外观。(可选)"
+msgstr "用于个性化版块外观的 CSS class。(可选)"
 
 #: categories/admin/forms.py:63
 msgid "Closed category"
@@ -216,38 +216,37 @@ msgstr "已关闭版块"
 
 #: categories/admin/forms.py:66
 msgid "Only members with valid permissions can post in closed categories."
-msgstr "只有拥有特定权限的成员可以在已经关闭的版块中发帖。"
+msgstr "只有具备特定权限的成员可以在已经关闭的版块中发帖。"
 
-#: categories/admin/forms.py:70 conf/admin/__init__.py:79
+#: categories/admin/forms.py:70 conf/admin/__init__.py:93
 #: templates/misago/admin/categories/list.html:19
 #: templates/misago/admin/dashboard/totals.html:19
 #: templates/misago/navbar.html:20 templates/misago/navbar.html:36
 #: templates/misago/profile/threads.html:5
 #: templates/misago/profile/threads.html:8
 #: templates/misago/profile/threads.html:9
-#: templates/misago/threadslist/category.html:74
+#: templates/misago/threadslist/category.html:68
 #: templates/misago/threadslist/threads.html:14
 #: templates/misago/threadslist/threads.html:16
-#: templates/misago/threadslist/threads.html:18
-#: templates/misago/threadslist/threads.html:35
-#: templates/misago/threadslist/threads.html:44
-#: templates/misago/threadslist/threads.html:68
+#: templates/misago/threadslist/threads.html:33
+#: templates/misago/threadslist/threads.html:42
+#: templates/misago/threadslist/threads.html:66
 #: threads/permissions/threads.py:73 threads/permissions/threads.py:104
-#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:98
+#: threads/search.py:16 threads/viewmodels/thread.py:122 users/apps.py:106
 msgid "Threads"
 msgstr "话题"
 
 #: categories/admin/forms.py:73
 msgid "All threads started in this category will require moderator approval."
-msgstr "此版块发起的所有话题都必须经过版主审批。"
+msgstr "发表在此版块的所有话题都需要经过版主批准。"
 
 #: categories/admin/forms.py:77
 msgid "Replies"
-msgstr "回"
+msgstr "回"
 
 #: categories/admin/forms.py:80
 msgid "All replies posted in this category will require moderator approval."
-msgstr "此版块发起的所有回帖都必须经过版主审批。"
+msgstr "发表在此版块的所有回复都需要经过版主审批。"
 
 #: categories/admin/forms.py:84
 msgid "Edits"
@@ -257,7 +256,7 @@ msgstr "编辑"
 msgid ""
 "Will make all edited replies return to unapproved state for moderator to "
 "review."
-msgstr "将把所有编辑过的回帖设置为未审批状态,以供版主审核。"
+msgstr "将把所有编辑过的回复设置为未审批状态,以供版主审批。"
 
 #: categories/admin/forms.py:92
 msgid "Thread age"
@@ -267,43 +266,43 @@ msgstr "话题寿命"
 msgid ""
 "Prune thread if number of days since its creation is greater than specified."
 " Enter 0 to disable this pruning criteria."
-msgstr "在距离最初发起时间超过此处设定天数后自动删除话题。输入 0 以禁用此功能。"
+msgstr "如果话题的创建时长超过指定的天数,直接删除话题。输入0禁用此功能。"
 
 #: categories/admin/forms.py:100
 msgid "Last reply"
-msgstr "最后回"
+msgstr "最后回"
 
 #: categories/admin/forms.py:103
 msgid ""
 "Prune thread if number of days since last reply is greater than specified. "
 "Enter 0 to disable this pruning criteria."
-msgstr "在距离最后一次回帖超过此处设定天数后自动删除话题,输入0以禁用此功能。"
+msgstr "如果话题的最后回复超过指定的天数,直接删除话题。输入0禁用此功能。"
 
 #: categories/admin/forms.py:126
 msgid "Permissions cannot be copied from category into itself."
-msgstr "无法复制版块权限到自身。"
+msgstr "无法复制自身的权限。"
 
 #: categories/admin/forms.py:133
 msgid "Category cannot act as archive for itself."
-msgstr "版块不能作为它自己的存档。"
+msgstr "无法归档到自身中。"
 
 #: categories/admin/forms.py:155
 msgid "Parent category"
-msgstr "父版块"
+msgstr "父版块"
 
 #: categories/admin/forms.py:161
 msgid "Copy permissions"
-msgstr "从现有版块中  直接复制版块权限设置"
+msgstr "复制权限"
 
 #: categories/admin/forms.py:163
 msgid ""
 "You can replace this category permissions with permissions copied from "
 "category selected here."
-msgstr "新创建的版块与这里指定的版块权限相同。"
+msgstr "你可以复制选定的版块权限到当前版块中。"
 
 #: categories/admin/forms.py:167
 msgid "Don't copy permissions"
-msgstr "不从现有版块复制权限设置"
+msgstr "不复制权限"
 
 #: categories/admin/forms.py:171
 msgid "Archive"
@@ -313,29 +312,29 @@ msgstr "归档"
 msgid ""
 "Instead of being deleted, pruned threads can be moved to designated "
 "category."
-msgstr "被修剪的话题不会被删除,而是会被移动到特定版块。"
+msgstr "替换直接删除,你可以把超过寿命的话题归档到指定的版块中。"
 
 #: categories/admin/forms.py:177
 msgid "Don't archive pruned threads"
-msgstr "直接删除,而不归档话题"
+msgstr "直接删除"
 
 #: categories/admin/forms.py:194
 msgid "You are trying to move this category threads to itself."
-msgstr "你正在试图把这个版块的帖子移动到它自己。"
+msgstr "你正在移动话题到该话题本身的版块中。"
 
 #: categories/admin/forms.py:200
 msgid ""
 "You are trying to move this category threads to a child category that will "
 "be deleted together with this category."
-msgstr "你正在试图把这个版块的帖子移动到子版块,这样父版块被删除的时候会被一起删除。"
+msgstr "你正在将当前版块话题移动到子版块中,如果父版块删除,子版块将会一起删除。"
 
 #: categories/admin/forms.py:213
 msgid "Move category threads to"
-msgstr "移动版块帖子到"
+msgstr "移动版块话题到"
 
 #: categories/admin/forms.py:216 categories/admin/forms.py:230
 msgid "Delete with category"
-msgstr "连版块一起删除"
+msgstr "同时删除版块"
 
 #: categories/admin/forms.py:228
 msgid "Move child categories to"
@@ -349,11 +348,11 @@ msgstr "身份"
 
 #: categories/admin/forms.py:253 categories/admin/forms.py:268
 msgid "No access"
-msgstr "无访问"
+msgstr "无访问"
 
 #: categories/admin/views/categories.py:17
 msgid "Requested category does not exist."
-msgstr "请求的版块不存在"
+msgstr "请求的版块不存在."
 
 #: categories/admin/views/categories.py:96
 #, python-format
@@ -383,7 +382,7 @@ msgstr "已移动版块 “%(name)s” 到 “%(other)s” 之上。"
 #: categories/admin/views/perms.py:134
 #, python-format
 msgid "Category %(name)s permissions have been changed."
-msgstr "已修改 %(name)s 版块的权限。"
+msgstr "已修改 %(name)s 版块的权限。"
 
 #: categories/admin/views/perms.py:145
 #: templates/misago/admin/categoryroles/categoryroles.html:37
@@ -393,7 +392,7 @@ msgstr "修改权限"
 
 #: categories/admin/views/perms.py:158
 msgid "No categories exist."
-msgstr "无版块存在。"
+msgstr "无版块。"
 
 #: categories/admin/views/perms.py:197
 #, python-format
@@ -410,11 +409,11 @@ msgstr "第一个版块"
 
 #: categories/migrations/0003_categories_roles.py:10
 msgid "See only"
-msgstr "仅查"
+msgstr "仅查阅版块"
 
 #: categories/migrations/0003_categories_roles.py:18
 msgid "Read only"
-msgstr "仅阅读"
+msgstr "仅阅读话题"
 
 #: categories/migrations/0003_categories_roles.py:33
 msgid "Reply to threads"
@@ -422,11 +421,11 @@ msgstr "回复话题"
 
 #: categories/migrations/0003_categories_roles.py:51
 msgid "Start and reply threads"
-msgstr "发起回复话题"
+msgstr "发起回复话题"
 
 #: categories/migrations/0006_moderation_queue_roles.py:10
 msgid "In moderation queue"
-msgstr "在审查队列中"
+msgstr "进入审查队列"
 
 #: categories/migrations/0007_best_answers_roles.py:11
 msgid "Q&A user"
@@ -442,31 +441,31 @@ msgstr "访问版块"
 
 #: categories/permissions.py:15
 msgid "Can see category"
-msgstr "可以看到版块"
+msgstr "可查看版块"
 
 #: categories/permissions.py:16
 msgid "Can see category contents"
-msgstr "可以看到版块内容"
+msgstr "可查看版块内容"
 
 #: categories/permissions.py:119
 #, python-format
 msgid "You don't have permission to browse \"%(category)s\" contents."
-msgstr "你无法浏览 “%(category)s” 中内容。"
+msgstr "你无法浏览 \"%(category)s\" 版块中的内容。"
 
-#: conf/admin/__init__.py:41 templates/misago/admin/conf/index.html:5
+#: conf/admin/__init__.py:45 templates/misago/admin/conf/index.html:5
 #: templates/misago/admin/themes/form.html:48
 msgid "Settings"
 msgstr "设置"
 
-#: conf/admin/__init__.py:48 templates/misago/admin/socialauth/form.html:27
+#: conf/admin/__init__.py:52 templates/misago/admin/socialauth/form.html:27
 msgid "General"
 msgstr "通用"
 
-#: conf/admin/__init__.py:49
+#: conf/admin/__init__.py:53
 msgid "Change forum details like name, description or footer."
 msgstr "修改论坛信息,比如名称,描述信息,页脚信息等。"
 
-#: conf/admin/__init__.py:54 templates/misago/admin/dashboard/totals.html:7
+#: conf/admin/__init__.py:58 templates/misago/admin/dashboard/totals.html:7
 #: templates/misago/admin/users/ban.html:22 templates/misago/navbar.html:42
 #: templates/misago/userslists/base.html:5
 #: templates/misago/userslists/base.html:14 users/admin/__init__.py:74
@@ -474,28 +473,38 @@ msgstr "修改论坛信息,比如名称,描述信息,页脚信息等。"
 msgid "Users"
 msgstr "用户"
 
-#: conf/admin/__init__.py:56
+#: conf/admin/__init__.py:60
 msgid "Customize user accounts default behavior and features availability."
 msgstr "自定义用户账号的默认行为和功能。"
 
-#: conf/admin/__init__.py:63
+#: conf/admin/__init__.py:67
 msgid "Captcha"
 msgstr "验证码"
 
-#: conf/admin/__init__.py:65
+#: conf/admin/__init__.py:69
 msgid "Setup protection against automatic registrations on the site."
 msgstr "为站点上的自动注册设置保护措施。"
 
-#: conf/admin/__init__.py:72 templates/misago/admin/dashboard/analytics.html:7
+#: conf/admin/__init__.py:76
+msgid "Single Sign-On"
+msgstr ""
+
+#: conf/admin/__init__.py:78
+msgid ""
+"SSO enables you to delegate user login and registration from Misago tothe "
+"third party site."
+msgstr ""
+
+#: conf/admin/__init__.py:86 templates/misago/admin/dashboard/analytics.html:7
 #: templates/misago/admin/dashboard/index.html:40
 msgid "Analytics"
 msgstr "分析"
 
-#: conf/admin/__init__.py:73
+#: conf/admin/__init__.py:87
 msgid "Enable Google Analytics or setup Google Site Verification."
 msgstr "启用谷歌分析或设置谷歌网站验证。"
 
-#: conf/admin/__init__.py:80
+#: conf/admin/__init__.py:94
 msgid "Threads, posts, polls and attachments options."
 msgstr "话题、帖子、投票和附件选项。"
 
@@ -543,11 +552,11 @@ msgstr "启用验证码"
 
 #: conf/admin/forms/captcha.py:23
 msgid "No CAPTCHA"
-msgstr "没有人机验证"
+msgstr "验证"
 
 #: conf/admin/forms/captcha.py:24
 msgid "reCaptcha"
-msgstr "reCaptcha"
+msgstr "reCAPTCHA"
 
 #: conf/admin/forms/captcha.py:25
 #: templates/misago/admin/conf/captcha_settings.html:25
@@ -702,11 +711,11 @@ msgstr "删除图片"
 
 #: conf/admin/forms/general.py:83
 msgid "Replace image with avatar on user profiles"
-msgstr "将图片替换为用户资料上的头像"
+msgstr "在用户资料页面中将图片替换为头像"
 
 #: conf/admin/forms/general.py:86
 msgid "Replace image with avatar on threads"
-msgstr "将图片替换为话题中的头像"
+msgstr "在话题页面中将图片替换为头像"
 
 #: conf/admin/forms/general.py:90
 #: templates/misago/admin/conf/general_settings.html:59
@@ -723,7 +732,7 @@ msgstr "电子邮件落款"
 
 #: conf/admin/forms/general.py:98
 msgid "Optional short message included at the end of e-mails sent by forum."
-msgstr "附加由本论坛发送的电子邮件末尾的短消息。(可选)"
+msgstr "由本论坛发送的电子邮件末尾的短消息。(可选)"
 
 #: conf/admin/forms/general.py:109
 #, python-format
@@ -732,6 +741,39 @@ msgid ""
 "Address under which site is running appears to be \"%(address)s\"."
 msgstr "系统使用此设置创建发送给用户邮件中的正确连接。当前站点的正确链接似乎是 “%(address)s”。"
 
+#: conf/admin/forms/sso.py:13
+msgid "Enable Single Sign-On"
+msgstr ""
+
+#: conf/admin/forms/sso.py:15
+msgid ""
+"Enabling SSO will make login option redirect users to the server URL "
+"configured below. It will also disable option to register on forum, change "
+"username, email or passward, as those features will be delegated to the 3rd "
+"party site."
+msgstr ""
+
+#: conf/admin/forms/sso.py:22
+msgid "Public key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:24 conf/admin/forms/sso.py:32
+msgid ""
+"Leave this field empty for Misago to generate this key on form submission."
+msgstr ""
+
+#: conf/admin/forms/sso.py:30
+msgid "Private key"
+msgstr ""
+
+#: conf/admin/forms/sso.py:37
+msgid "Server URL"
+msgstr ""
+
+#: conf/admin/forms/sso.py:50
+msgid "You need to enter server URL to enable SSO."
+msgstr ""
+
 #: conf/admin/forms/threads.py:27
 msgid "Daily post limit per user"
 msgstr "用户每日发帖限制"
@@ -745,14 +787,14 @@ msgstr "每个用户每日发帖的数量。如果论坛垃圾邮件过多的时
 
 #: conf/admin/forms/threads.py:36
 msgid "Hourly post limit per user"
-msgstr "用户小时发帖限制"
+msgstr "用户小时发帖限制"
 
 #: conf/admin/forms/threads.py:38
 msgid ""
 "Hourly limit of posts that may be posted by single user. Fail-safe for "
 "situations when forum is flooded by spam bots. Change to 0 to remove the "
 "limit."
-msgstr "每个用户每小时发帖的数量。如果论坛垃圾邮件过多的时候可在此调整数据量。设为0将删除限制。"
+msgstr "每个用户每小时发帖的数量。如果论坛垃圾邮件过多的时候可在此调整数据量。设为 0 将移除限制。"
 
 #: conf/admin/forms/threads.py:45
 msgid "Maximum number of attachments per post"
@@ -768,15 +810,15 @@ msgstr "最小帖子长度"
 
 #: conf/admin/forms/threads.py:54
 msgid "Maximum allowed thread title length"
-msgstr "最大的话题名称长度"
+msgstr "话题名称的最大长度"
 
 #: conf/admin/forms/threads.py:57
 msgid "Minimum required thread title length"
-msgstr "话题名称最小长度"
+msgstr "话题名称最小长度"
 
 #: conf/admin/forms/threads.py:60
 msgid "Unused attachments lifetime"
-msgstr "未使用的附件保存时限"
+msgstr "未附加附件保存时限"
 
 #: conf/admin/forms/threads.py:62
 msgid ""
@@ -786,7 +828,7 @@ msgstr "删除用户上传的文件,如果在指定时间之内该文件未附
 
 #: conf/admin/forms/threads.py:69
 msgid "Read-tracker cutoff"
-msgstr "阅读跟踪天数"
+msgstr "阅读跟踪截止时间"
 
 #: conf/admin/forms/threads.py:71
 msgid ""
@@ -867,7 +909,7 @@ msgstr "发送给用户的激活令牌"
 
 #: conf/admin/forms/users.py:41
 msgid "Activation by administrator"
-msgstr "管理员手动激活"
+msgstr "管理员激活"
 
 #: conf/admin/forms/users.py:42
 msgid "Disable new registrations"
@@ -919,7 +961,7 @@ msgstr "个人"
 
 #: conf/admin/forms/users.py:78
 msgid "Gravatar"
-msgstr "Gravatar(中国大陆不可用)"
+msgstr "Gravatar"
 
 #: conf/admin/forms/users.py:79 conf/admin/forms/users.py:91
 msgid "Random avatar from gallery"
@@ -957,7 +999,7 @@ msgstr "最大签名长度"
 #: conf/admin/forms/users.py:113 threads/permissions/threads.py:110
 #: users/admin/forms.py:175
 msgid "Started threads"
-msgstr "自己发起的话题"
+msgstr "发起的话题"
 
 #: conf/admin/forms/users.py:115 conf/admin/forms/users.py:127
 msgid "Don't watch"
@@ -969,11 +1011,11 @@ msgstr "添加到订阅的话题列表"
 
 #: conf/admin/forms/users.py:119 conf/admin/forms/users.py:131
 msgid "Put on watched threads list and e-mail user when somebody replies"
-msgstr "添加到订阅的话题列表,并在有人回的时给用户发送邮件"
+msgstr "添加到订阅的话题列表,并在有人回的时给用户发送邮件"
 
 #: conf/admin/forms/users.py:125
 msgid "Replied threads"
-msgstr "被回复的话题"
+msgstr "已回复话题"
 
 #: conf/admin/forms/users.py:138
 msgid "Number of users displayed on a single page"
@@ -1025,7 +1067,7 @@ msgstr "用户 IP 存放的网站数据库中的天数。输入 0 将永久保
 
 #: conf/admin/forms/users.py:183
 msgid "Anonymous username"
-msgstr "匿名用户名"
+msgstr "匿名用户名"
 
 #: conf/admin/forms/users.py:185
 msgid ""
@@ -1042,7 +1084,7 @@ msgstr "上传的图片的边长至少炫耀 %(size)s 像素。"
 msgid "This value must be lower than number of users per page."
 msgstr "此值必须低于每页的用户数。"
 
-#: conf/admin/views.py:39
+#: conf/admin/views.py:40
 msgid "Settings have been saved."
 msgstr "设置已保存。"
 
@@ -1069,15 +1111,15 @@ msgstr "使用 %(backend)s 登录到你账户的时候遇到问题。"
 
 #: core/errorpages.py:84
 msgid "The sign in process has been canceled by user."
-msgstr "登录进程被用户取消。"
+msgstr "登录进程被用户取消。"
 
 #: core/errorpages.py:86
 msgid "The other service could not be reached."
-msgstr "无法访问该服务。"
+msgstr "无法连接到远程服务器。"
 
 #: core/errorpages.py:92
 msgid "Unexpected problem has been encountered during sign in process."
-msgstr "登录进程遇到了意外的问题。"
+msgstr "登录过程发生了错误。"
 
 #: core/errorpages.py:113
 msgid ""
@@ -1087,16 +1129,11 @@ msgstr "你的请求被拒绝,因为你的浏览器没有发送 CSRF cookie 
 
 #: core/rest_permissions.py:9
 msgid "This action is not available to guests."
-msgstr "访客不能执行这个操作。"
+msgstr "访客无法使执行此操作。"
 
 #: core/templatetags/misago_pagetitle.py:10
 #: templates/misago/thread/private_thread.html:7
 #: templates/misago/thread/thread.html:7
-#: templates/misago/threadslist/category.html:8
-#: templates/misago/threadslist/category.html:13
-#: templates/misago/threadslist/private_threads.html:8
-#: templates/misago/threadslist/private_threads.html:13
-#: templates/misago/threadslist/threads.html:16
 #, python-format
 msgid "page: %(page)s"
 msgstr "页:%(page)s"
@@ -1107,7 +1144,7 @@ msgstr "必须包括字母或者数字。"
 
 #: core/validators.py:12
 msgid "Value is too long."
-msgstr "值太长。"
+msgstr "长。"
 
 #: core/validators.py:26
 msgid "Uploaded image is not a square."
@@ -1142,7 +1179,7 @@ msgstr "该网站正在运行 Misago 的最新版本。"
 #: graphql/admin/versioncheck.py:68
 #, python-format
 msgid "Misago %(version)s is latest release."
-msgstr "Misago %(version)s 是最新版本。"
+msgstr "Misago %(version)s 是最新版本。"
 
 #: graphql/admin/versioncheck.py:74
 msgid "The site is running outdated version of Misago."
@@ -1233,11 +1270,11 @@ msgstr "如果你的协议在其他页面上,请在此输入该页面的链接
 
 #: legal/admin/forms.py:35
 msgid "You can use Markdown syntax for rich text elements."
-msgstr "你可以使用 Markdown 编辑内容。"
+msgstr "你可以在每一个富文本域中使用 MarkDown 语法。"
 
 #: legal/admin/forms.py:48
 msgid "Please fill in agreement link or text."
-msgstr "请填写协议链接或内容。"
+msgstr "请填写协议链接或文本。"
 
 #: legal/admin/forms.py:66 threads/admin/forms.py:8
 msgid "All types"
@@ -1245,7 +1282,7 @@ msgstr "所有类型"
 
 #: legal/admin/forms.py:68
 msgid "Content"
-msgstr "容"
+msgstr "容"
 
 #: legal/admin/views.py:16
 msgid "Requested agreement does not exist."
@@ -1277,26 +1314,26 @@ msgstr "删除协议"
 
 #: legal/admin/views.py:37
 msgid "Are you sure you want to delete those agreements?"
-msgstr "确定删除这些协议?"
+msgstr "确定删除这些协议?"
 
 #: legal/admin/views.py:48
 msgid "Selected agreements have been deleted."
-msgstr "选定的协议已被删除。"
+msgstr "选协议已被删除。"
 
 #: legal/admin/views.py:52
 #, python-format
 msgid "New agreement \"%(title)s\" has been saved."
-msgstr "新协议 “%(title)s” 已保存。"
+msgstr "新协议 \"%(title)s\" 已保存。"
 
 #: legal/admin/views.py:63
 #, python-format
 msgid "Agreement \"%(title)s\" has been edited."
-msgstr "已编辑协议 \"%(title)s\" 。"
+msgstr "已编辑协议 \"%(title)s\"。"
 
 #: legal/admin/views.py:78
 #, python-format
 msgid "Agreement \"%(title)s\" has been deleted."
-msgstr "已删除协议 \"%(title)s\" 。"
+msgstr "已删除协议 \"%(title)s\"。"
 
 #: legal/admin/views.py:86
 #, python-format
@@ -1306,7 +1343,7 @@ msgstr "\"%(title)s\" 协议已设为 \"%(type)s\" 类型的启用协议。"
 #: legal/admin/views.py:98
 #, python-format
 msgid "Agreement \"%(title)s\" has been disabled."
-msgstr "已禁用协议 \"%(title)s\" 。"
+msgstr "已禁用 \"%(title)s\"协议 。"
 
 #: legal/api.py:17
 msgid "You have already accepted this agreement."
@@ -1324,15 +1361,28 @@ msgstr "服务条款"
 msgid "Privacy policy"
 msgstr "隐私政策"
 
-#: markup/finalise.py:20
+#: markup/finalize.py:24
 #, python-format
 msgid "%(title)s has written:"
 msgstr "%(title)s 说:"
 
-#: markup/finalise.py:22
+#: markup/finalize.py:26
 msgid "Quoted message:"
 msgstr "引用消息:"
 
+#: markup/finalize.py:33
+#, python-format
+msgid "%(title)s:"
+msgstr ""
+
+#: markup/finalize.py:35
+msgid "Spoiler:"
+msgstr ""
+
+#: markup/finalize.py:40
+msgid "Reveal spoiler"
+msgstr ""
+
 #: search/api.py:17 search/views.py:12 search/views.py:21
 msgid "You don't have permission to search site."
 msgstr "你没有搜索全站的权限。"
@@ -1381,7 +1431,7 @@ msgstr "如果用户账户使用的电子邮件地址与该社交网站上的相
 #: socialauth/admin/forms/base.py:51 socialauth/admin/forms/base.py:53
 #: threads/admin/forms.py:97
 msgid "This field is required."
-msgstr "必须填写。"
+msgstr "必填项。"
 
 #: socialauth/admin/forms/facebook.py:8
 msgid "App ID"
@@ -1447,7 +1497,19 @@ msgstr "你的账户必须通过网站管理员激活,才可以使用 %(backen
 
 #: socialauth/pipeline.py:223 users/api/userendpoints/create.py:60
 msgid "Please try resubmitting the form."
-msgstr "请尝试重新提交表单。"
+msgstr "请重新尝试提交表单。"
+
+#: socialauth/views.py:23
+msgid "Please use the 3rd party site to login."
+msgstr ""
+
+#: sso/validators.py:24 users/validators.py:79
+msgid "This username is not allowed."
+msgstr "不允许使用此用户名。"
+
+#: sso/validators.py:33 users/forms/register.py:45 users/validators.py:51
+msgid "This e-mail address is not allowed."
+msgstr "不能使用此电子邮件。"
 
 #: templates/misago/acl_debug.html:5
 #, python-format
@@ -1458,7 +1520,7 @@ msgid ""
 msgstr ""
 "\n"
 "    %(user)s 的身份\n"
-"  "
+"    "
 
 #: templates/misago/acl_debug.html:9
 msgid "Anonymous roles"
@@ -1466,7 +1528,7 @@ msgstr "匿名身份"
 
 #: templates/misago/acl_debug.html:30
 msgid "Current ACL"
-msgstr "当前 ACL"
+msgstr "当前ACL"
 
 #: templates/misago/acl_debug.html:34
 msgid "Key"
@@ -1484,7 +1546,7 @@ msgstr "账号已激活"
 msgid ""
 "You can now sign in to finish setting up your account and to participate in "
 "or start new discussions."
-msgstr "你可以登录以完成账号设置,参加或者发起新的讨论。"
+msgstr "你可以登录完成账户信息,然后参与或发起一个话题。"
 
 #: templates/misago/activation/error.html:5
 msgid "Activation error"
@@ -1492,7 +1554,7 @@ msgstr "激活错误"
 
 #: templates/misago/activation/error.html:19
 msgid "Can't activate account."
-msgstr "无法激活账号。"
+msgstr "不能激活账号."
 
 #: templates/misago/activation/request.html:5
 #: templates/misago/activation/request.html:13
@@ -1503,7 +1565,7 @@ msgstr "请求验证链接"
 msgid ""
 "Site administrator may impose requirement on newly regitered accounts to be "
 "activated before users will be able to sign in."
-msgstr "站点管理员可能要求新注册的账号在激活后才可登录。"
+msgstr "你需要激活账号才可以登录。"
 
 #: templates/misago/activation/request.html:28
 msgid ""
@@ -1521,7 +1583,7 @@ msgstr "为了得到这个链接,输入你的电子邮箱地址并按下 “
 
 #: templates/misago/activation/request.html:49
 msgid "To request new activation link please enable JavaScript."
-msgstr "要请求新的激活链接,请在浏览器中启用 JavaScript。"
+msgstr "要请求新的激活链接,请在浏览器中启用JavaScript。"
 
 #: templates/misago/activation/stopped.html:5
 msgid "Activation failed"
@@ -1529,7 +1591,7 @@ msgstr "激活失败"
 
 #: templates/misago/activation/stopped.html:20
 msgid "Your account can't be activated at this time."
-msgstr "你的账号本次不能被激活。"
+msgstr "你的账号激活失败。"
 
 #: templates/misago/admin/agreements/form.html:9
 #: templates/misago/admin/agreements/form.html:40
@@ -1578,7 +1640,7 @@ msgstr "已创建"
 #: templates/misago/admin/themes/assets/css.html:32
 #: templates/misago/admin/themes/assets/media.html:22
 msgid "Modified"
-msgstr "修改"
+msgstr "修改"
 
 #: templates/misago/admin/agreements/list.html:41
 msgid "Users are required to accept this agreement to use the site"
@@ -1597,11 +1659,11 @@ msgstr "%(created_by)s 创建于 %(created_on)s"
 #: templates/misago/admin/agreements/list.html:78
 #, python-format
 msgid "%(last_modified_on)s by %(last_modified_by)s"
-msgstr "%(last_modified_by)s 修改于 %(last_modified_on)s"
+msgstr "%(last_modified_by)s 编辑于 %(last_modified_on)s"
 
 #: templates/misago/admin/agreements/list.html:82
 msgid "never"
-msgstr "从"
+msgstr "从"
 
 #: templates/misago/admin/agreements/list.html:95
 #: templates/misago/admin/themes/list.html:78
@@ -1647,7 +1709,7 @@ msgstr "话题"
 #: templates/misago/admin/attachments/list.html:48
 #, python-format
 msgid "%(filetype)s, %(size)s, uploaded by %(uploader)s %(uploaded_on)s."
-msgstr "%(filetype)s,%(size)s,%(uploader)s 上传于 %(uploaded_on)s."
+msgstr "%(filetype)s, %(size)s, %(uploader)s 上传于 %(uploaded_on)s。"
 
 #: templates/misago/admin/attachments/list.html:59
 msgid "None"
@@ -1661,7 +1723,7 @@ msgstr "删除"
 
 #: templates/misago/admin/attachments/list.html:76
 msgid "No attachments matching criteria exist."
-msgstr "未找到符合搜索要求的附件。"
+msgstr "未找到符合要求的附件。"
 
 #: templates/misago/admin/attachments/list.html:78
 msgid "No attachments exist."
@@ -1691,7 +1753,7 @@ msgstr "基本选项"
 
 #: templates/misago/admin/attachmenttypes/form.html:47
 msgid "Availability"
-msgstr "可用性(权限)"
+msgstr "可"
 
 #: templates/misago/admin/attachmenttypes/list.html:18
 msgid "Extensions"
@@ -1712,7 +1774,7 @@ msgstr "不支持上传此文件类型"
 
 #: templates/misago/admin/attachmenttypes/list.html:34
 msgid "Limited"
-msgstr "已锁定"
+msgstr "限制"
 
 #: templates/misago/admin/attachmenttypes/list.html:37
 msgid "Uploading and downloading files of this type is disabled"
@@ -1835,7 +1897,7 @@ msgstr "版块内容"
 #: templates/misago/admin/categories/form.html:46
 #: templates/misago/admin/categories/list.html:9
 msgid "New category"
-msgstr "新版块"
+msgstr "新版块"
 
 #: templates/misago/admin/categories/form.html:29
 msgid "Edit permissions"
@@ -1849,11 +1911,11 @@ msgstr "编辑版块"
 
 #: templates/misago/admin/categories/form.html:54
 msgid "Display and position"
-msgstr "呈现和层级"
+msgstr "显示和位置"
 
 #: templates/misago/admin/categories/form.html:65
 msgid "Behaviour"
-msgstr "权限与状态"
+msgstr "特性"
 
 #: templates/misago/admin/categories/form.html:74
 msgid "Content approval"
@@ -1861,7 +1923,7 @@ msgstr "内容审批"
 
 #: templates/misago/admin/categories/form.html:84
 msgid "Prune threads"
-msgstr "修剪话题"
+msgstr "清除话题"
 
 #: templates/misago/admin/categories/list.html:17
 msgid "Category"
@@ -1872,7 +1934,7 @@ msgstr "版块"
 #: templates/misago/admin/dashboard/totals.html:31
 #: templates/misago/admin/users/list.html:21
 #: templates/misago/profile/posts.html:5 templates/misago/profile/posts.html:8
-#: templates/misago/profile/posts.html:9 users/apps.py:94
+#: templates/misago/profile/posts.html:9 users/apps.py:102
 msgid "Posts"
 msgstr "帖子"
 
@@ -1904,16 +1966,16 @@ msgstr "%(category)s:权限"
 #: templates/misago/admin/categoryroles/categoryroles.html:59
 #: templates/misago/admin/categoryroles/rolecategories.html:56
 msgid "Are you sure you want to abandon changes?"
-msgstr "确认放弃所有改?"
+msgstr "确认放弃所有改?"
 
 #: templates/misago/admin/categoryroles/form.html:9
 #: templates/misago/admin/categoryroles/form.html:28
 msgid "New category role"
-msgstr "新版块权限"
+msgstr "新版块身份"
 
 #: templates/misago/admin/categoryroles/form.html:26
 msgid "Edit category role"
-msgstr "编辑版块权限"
+msgstr "编辑版块身份"
 
 #: templates/misago/admin/categoryroles/list.html:9
 #: templates/misago/admin/roles/form.html:9
@@ -1940,12 +2002,12 @@ msgstr "删除身份"
 
 #: templates/misago/admin/categoryroles/list.html:50
 msgid "No category roles are set."
-msgstr "未定义版块权限。"
+msgstr "未设置版块身份。"
 
 #: templates/misago/admin/categoryroles/list.html:59
 #: templates/misago/admin/roles/list.html:67
 msgid "Are you sure you want to delete this role?"
-msgstr "确认删除身份?"
+msgstr "确认删除身份?"
 
 #: templates/misago/admin/categoryroles/rolecategories.html:6
 #, python-format
@@ -1967,7 +2029,7 @@ msgstr "停止论坛垃圾邮件"
 #: templates/misago/admin/conf/form.html:16
 #: templates/misago/admin/socialauth/list.html:63
 msgid "Change settings"
-msgstr "改设置"
+msgstr "改设置"
 
 #: templates/misago/admin/conf/form.html:27
 #: templates/misago/admin/generic/form.html:25
@@ -1980,7 +2042,7 @@ msgstr "表单存在错误。"
 #: templates/misago/emails/change_email.html:16
 #: templates/misago/emails/change_password.html:16
 msgid "Save changes"
-msgstr "确定"
+msgstr "保存修改"
 
 #: templates/misago/admin/conf/general_settings.html:8
 msgid "Site details"
@@ -1992,7 +2054,7 @@ msgstr "分享预览图片"
 
 #: templates/misago/admin/conf/general_settings.html:49
 msgid "Forum index"
-msgstr "论坛页"
+msgstr "论坛页"
 
 #: templates/misago/admin/conf/threads_settings.html:8
 msgid "Posting"
@@ -2014,45 +2076,56 @@ msgstr "阅读跟踪器"
 msgid "Attachment error images"
 msgstr "附件错误图片"
 
-#: templates/misago/admin/conf/users_settings.html:8
+#: templates/misago/admin/conf/users_settings.html:9
+#: templates/misago/admin/socialauth/list.html:97
+msgid "Note"
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:9
+msgid ""
+"Single Sign-On is enabled. Site's registration, password and deletion "
+"features have been disabled and delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/conf/users_settings.html:14
 msgid "New accounts"
 msgstr "新账号"
 
-#: templates/misago/admin/conf/users_settings.html:17 users/admin/forms.py:484
+#: templates/misago/admin/conf/users_settings.html:23 users/admin/forms.py:484
 #: users/admin/forms.py:573
 msgid "Usernames"
 msgstr "用户名"
 
-#: templates/misago/admin/conf/users_settings.html:27
+#: templates/misago/admin/conf/users_settings.html:33
 msgid "Avatars"
 msgstr "头像"
 
-#: templates/misago/admin/conf/users_settings.html:43
+#: templates/misago/admin/conf/users_settings.html:49
 msgid "Signatures"
 msgstr "签名"
 
-#: templates/misago/admin/conf/users_settings.html:51
+#: templates/misago/admin/conf/users_settings.html:57
 #: users/admin/__init__.py:80
 msgid "Data downloads"
-msgstr "数据下载"
+msgstr "下载数据"
 
-#: templates/misago/admin/conf/users_settings.html:60
+#: templates/misago/admin/conf/users_settings.html:66
 msgid "Own account deletion"
 msgstr "删除帐户"
 
-#: templates/misago/admin/conf/users_settings.html:68 users/admin/forms.py:492
+#: templates/misago/admin/conf/users_settings.html:74 users/admin/forms.py:492
 msgid "IP addresses"
 msgstr "IP 地址"
 
-#: templates/misago/admin/conf/users_settings.html:76
+#: templates/misago/admin/conf/users_settings.html:82
 msgid "Default subscription preferences"
 msgstr "默认订阅首选项"
 
-#: templates/misago/admin/conf/users_settings.html:85
+#: templates/misago/admin/conf/users_settings.html:91
 msgid "Users lists"
 msgstr "用户列表"
 
-#: templates/misago/admin/conf/users_settings.html:94
+#: templates/misago/admin/conf/users_settings.html:100
 msgid "Top posters ranking"
 msgstr "活跃用户排行榜"
 
@@ -2178,7 +2251,7 @@ msgstr "附件"
 #: templates/misago/admin/datadownloads/form.html:6
 #: templates/misago/admin/datadownloads/form.html:11
 msgid "Request new data downloads"
-msgstr "请求新数据下载"
+msgstr "请求新数据下载"
 
 #: templates/misago/admin/datadownloads/list.html:9
 msgid "New downloads"
@@ -2230,7 +2303,7 @@ msgstr "无数据下载。"
 #: templates/misago/admin/errorpages/403.html:5
 #: templates/misago/errorpages/403.html:5
 msgid "Page not available"
-msgstr "页面不可用"
+msgstr "页面不存在"
 
 #: templates/misago/admin/errorpages/403.html:12
 msgid "Requested page is not available"
@@ -2263,7 +2336,7 @@ msgstr "请求的页面未找到"
 #: templates/misago/errorpages/404.html:23
 msgid ""
 "The link you clicked was incorrect or the page has been moved or deleted."
-msgstr "你点击的链接所指向的页面已经被删除"
+msgstr "你点击的链接所指向的页面已经被删除."
 
 #: templates/misago/admin/errorpages/csrf_failure.html:5
 #: templates/misago/admin/errorpages/csrf_failure.html:14
@@ -2327,7 +2400,7 @@ msgstr "保存并继续编辑"
 
 #: templates/misago/admin/generic/form.html:49
 msgid "Save and add another"
-msgstr "保存后继续添加"
+msgstr "保存并新增"
 
 #: templates/misago/admin/generic/form.html:52
 #: templates/misago/admin/themes/assets/css-editor-form.html:62
@@ -2351,7 +2424,7 @@ msgstr "完成"
 
 #: templates/misago/admin/generic/mass_actions.html:10
 msgid "With selected:"
-msgstr "选择:"
+msgstr "选择:"
 
 #: templates/misago/admin/generic/order_by.html:5
 msgid "Sort:"
@@ -2364,7 +2437,7 @@ msgstr "将排序更改为:"
 #: templates/misago/admin/generic/paginator.html:4
 #: templates/misago/thread/paginator.html:7
 msgid "Go to first page"
-msgstr "转到第一页"
+msgstr "转到页"
 
 #: templates/misago/admin/generic/paginator.html:5
 #: templates/misago/admin/generic/paginator.html:9
@@ -2570,7 +2643,7 @@ msgid "Enabled login methods"
 msgstr "已启用登录方式"
 
 #: templates/misago/admin/socialauth/list.html:15
-#: templates/misago/admin/socialauth/list.html:106
+#: templates/misago/admin/socialauth/list.html:112
 msgid "Provider"
 msgstr "服务商"
 
@@ -2586,19 +2659,25 @@ msgstr "未启用社交登录。"
 msgid "Are you sure you want to disable this social login provider?"
 msgstr "确定停用此社交登录服务?"
 
-#: templates/misago/admin/socialauth/list.html:100
+#: templates/misago/admin/socialauth/list.html:97
+msgid ""
+"Single Sign-On is enabled. Social authentication has been disabled and "
+"delegated to the third-party site."
+msgstr ""
+
+#: templates/misago/admin/socialauth/list.html:106
 msgid "Setup new login method"
 msgstr "设置新登录方式"
 
-#: templates/misago/admin/socialauth/list.html:119
+#: templates/misago/admin/socialauth/list.html:125
 msgid "Setup login with this provider"
 msgstr "设置此登录服务"
 
-#: templates/misago/admin/socialauth/list.html:120
+#: templates/misago/admin/socialauth/list.html:126
 msgid "Setup"
 msgstr "设置"
 
-#: templates/misago/admin/socialauth/list.html:127
+#: templates/misago/admin/socialauth/list.html:133
 msgid "No new login providers are available for setup at this time."
 msgstr "当前没有新的社交登录可设置。"
 
@@ -2855,7 +2934,7 @@ msgstr "账号已禁用"
 #, python-format
 msgid "%(posts)s post"
 msgid_plural "%(posts)s posts"
-msgstr[0] "%(posts)s 帖子"
+msgstr[0] "%(posts)s 帖子"
 
 #: templates/misago/admin/users/edit.html:99
 #: templates/misago/categories/stats.html:5
@@ -2863,7 +2942,7 @@ msgstr[0] "%(posts)s 个帖子"
 #, python-format
 msgid "%(threads)s thread"
 msgid_plural "%(threads)s threads"
-msgstr[0] "%(threads)s 话题"
+msgstr[0] "%(threads)s 话题"
 
 #: templates/misago/admin/users/edit.html:110
 #: templates/misago/admin/users/new.html:18
@@ -2887,15 +2966,15 @@ msgstr "登录凭证"
 msgid ""
 "This user has not set account password and uses other service to "
 "authenticate."
-msgstr "此用户没有设置账户密码,使用快捷登录。"
+msgstr "此用户没有设置账户密码,使用社交账号登录。"
 
 #: templates/misago/admin/users/edit.html:205
 msgid "Signature"
 msgstr "签名"
 
-#: templates/misago/admin/users/edit.html:228 users/apps.py:24
+#: templates/misago/admin/users/edit.html:228 users/apps.py:27
 msgid "Forum options"
-msgstr "论坛设置"
+msgstr "论坛选项"
 
 #: templates/misago/admin/users/edit.html:237
 msgid "Automatic subscription preferences"
@@ -2909,7 +2988,7 @@ msgstr "账号状态"
 msgid ""
 "This user is deleting their account. It has been deactivated for the "
 "duration of the process."
-msgstr "此用户正在删除他们的帐户。已停用这些用户。"
+msgstr "此用户正在删除他的帐户。已停用该用户。"
 
 #: templates/misago/admin/users/edit.html:251
 msgid ""
@@ -2927,7 +3006,7 @@ msgstr "接受于"
 
 #: templates/misago/admin/users/edit.html:324
 msgid "This user didn't accept any agreements."
-msgstr "此用户尚未接受协议。"
+msgstr "此用户不接受任何协议。"
 
 #: templates/misago/admin/users/list.html:9
 #: templates/misago/admin/users/new.html:6
@@ -2983,11 +3062,11 @@ msgstr "长度"
 
 #: templates/misago/admin/warnings/list.html:18
 msgid "Replying"
-msgstr "回"
+msgstr "回"
 
 #: templates/misago/admin/warnings/list.html:19
 msgid "Starting threads"
-msgstr "发起话题"
+msgstr "发起话题"
 
 #: templates/misago/admin/warnings/list.html:40
 msgid "Permanent"
@@ -3001,7 +3080,7 @@ msgstr "没有限制"
 #: templates/misago/admin/warnings/list.html:52
 #: templates/misago/admin/warnings/list.html:70
 msgid "Moderated"
-msgstr "已被审查"
+msgstr "已审批"
 
 #: templates/misago/admin/warnings/list.html:57
 #: templates/misago/admin/warnings/list.html:75
@@ -3030,7 +3109,7 @@ msgid ""
 msgid_plural ""
 "There are %(categories)s main categories currenty available on the "
 "%(forum_name)s."
-msgstr[0] "现在,%(forum_name)s中有%(categories)s个主版块。"
+msgstr[0] "%(forum_name)s现有%(categories)s个主版块。"
 
 #: templates/misago/categories/body.html:15
 msgid "No categories exist or you don't have permission to see them."
@@ -3038,7 +3117,7 @@ msgstr "版块不存在或你没有权限查看它们。"
 
 #: templates/misago/categories/icon.html:4
 msgid "This category has no new posts. (closed)"
-msgstr "此版块没有新帖子。(已关闭)"
+msgstr "此版块没有新帖子。(已关闭)"
 
 #: templates/misago/categories/icon.html:10
 msgid "This category has new posts. (closed)"
@@ -3062,19 +3141,19 @@ msgstr "这个板块已开启隐蔽模式。你仅可以看到你自己的话题
 
 #: templates/misago/categories/last_thread.html:82
 msgid "This category is protected. You can't browse it's contents."
-msgstr "此版块是受保护的。你无法浏览其内容。"
+msgstr "此版块已锁定。你暂时无法浏览。"
 
 #: templates/misago/emails/activation/by_admin.html:6
 #: templates/misago/emails/activation/by_admin.txt:6
 #, python-format
 msgid "%(user)s, your account has been activated by forum administrator."
-msgstr "%(user)s,你的账号已经被管理员激活。"
+msgstr "%(user)s, 你的账号已经被管理员激活。"
 
 #: templates/misago/emails/activation/by_admin.html:12
 #: templates/misago/emails/register/complete.html:18
 #: templates/misago/emails/register/inactive.html:31
 msgid "this form"
-msgstr "这个链接"
+msgstr "表单"
 
 #: templates/misago/emails/activation/by_admin.html:14
 #, python-format
@@ -3089,7 +3168,7 @@ msgstr "你现在可以使用以下表单登录:"
 #: templates/misago/emails/activation/by_user.txt:6
 #, python-format
 msgid "%(user)s, to activate your account click the below link:"
-msgstr "%(user)s,点击下面的链接激活账号:"
+msgstr "%(user)s 你好点击下链接激活账号:"
 
 #: templates/misago/emails/activation/by_user.html:11
 #: templates/misago/emails/register/inactive.html:27
@@ -3102,14 +3181,14 @@ msgstr "激活我的账号!"
 msgid ""
 "%(user)s, you are receiving this message because you have changed your "
 "e-mail address."
-msgstr "%(user)s,你收到这个消息,因为你已经改变了你账号绑定的电子邮箱地址。"
+msgstr "%(user)s 你好, 你已修改了账号绑定的电子邮箱地址,因此,我们向你发送这封邮件。"
 
 #: templates/misago/emails/change_email.html:11
 #: templates/misago/emails/change_email.txt:10
 #: templates/misago/emails/change_password.html:11
 #: templates/misago/emails/change_password.txt:10
 msgid "To confirm this change, click the link below:"
-msgstr "要确认此更改,请单击以下链接:"
+msgstr "确认此修改,请单击以下链接:"
 
 #: templates/misago/emails/change_password.html:6
 #: templates/misago/emails/change_password.txt:6
@@ -3117,7 +3196,7 @@ msgstr "要确认此更改,请单击以下链接:"
 msgid ""
 "%(user)s, you are receiving this message because you have changed your "
 "password."
-msgstr "%(user)s,你收到这个消息,因为你已经更改了你的账号密码。"
+msgstr "%(user)s 你好, 当你收到这封邮件的时候,表示你已经成功修改了密码。友情提示,请妥善保管号密码哟。"
 
 #: templates/misago/emails/change_password_form_link.html:6
 #: templates/misago/emails/change_password_form_link.txt:6
@@ -3125,12 +3204,12 @@ msgstr "%(user)s,你收到这个消息,因为你已经更改了你的账号
 msgid ""
 "%(user)s, you are receiving this message because you want to change "
 "forgotten password for your forum account."
-msgstr "%(user)s,你收到这个消息,是因为你已更改了密码。"
+msgstr "%(user)s 你好,站点已响应你发起的忘记密码请求,如果该操作是你发起的,请按下方提示操作,否则请忽略。"
 
 #: templates/misago/emails/change_password_form_link.html:11
 #: templates/misago/emails/change_password_form_link.txt:10
 msgid "To change your account password click the link below:"
-msgstr "要更改你的账号密码,请单击下面的链接:"
+msgstr "确认重置密码,请点击以下链接:"
 
 #: templates/misago/emails/change_password_form_link.html:16
 #: templates/misago/forgottenpassword/form.html:7
@@ -3146,9 +3225,9 @@ msgstr "设置新密码"
 msgid ""
 "%(user)s, you are receiving this message because your data is ready for "
 "download."
-msgstr "你好,%(user)s。系统已经准备好了你的数据,现在就可以下载了。"
+msgstr "%(user)s, 你好,当你收到这封邮件的时候,表示系统已经准备好了你的数据,并且现在就可以下载了。"
 
-#: templates/misago/emails/data_download.html:11 users/apps.py:52
+#: templates/misago/emails/data_download.html:11 users/apps.py:57
 msgid "Download data"
 msgstr "下载数据"
 
@@ -3161,7 +3240,7 @@ msgid ""
 msgid_plural ""
 "This link will remain active for %(expires_in)s hours from the time this "
 "message has been sent."
-msgstr[0] "此链接将在此邮件发送后的 %(expires_in)s 小时后失效。"
+msgstr[0] "此链接将在此邮件发送后的 %(expires_in)s 小时内有效。"
 
 #: templates/misago/emails/data_download.txt:10
 msgid "To download your data, click the following link:"
@@ -3172,7 +3251,7 @@ msgstr "请点击以下链接下载数据:"
 msgid ""
 "%(user)s, you are receiving this message because %(sender)s has invited you "
 "to participate in private thread %(thread)s."
-msgstr "%(user)s,你收到这个消息是因为 %(sender)s 邀请你参与隐蔽话题 %(thread)s。"
+msgstr "%(user)s 你好,%(sender)s 邀请你参与隐蔽话题 %(thread)s 的讨论,因此,我们向你发送这封邮件。"
 
 #: templates/misago/emails/privatethread/added.html:14
 #: templates/misago/emails/privatethread/added.txt:10
@@ -3184,14 +3263,14 @@ msgstr "请点击以下链接参与讨论:"
 msgid ""
 "%(user)s, you are receiving this message because %(sender)s has invited you "
 "to participate in private thread \"%(thread)s\"."
-msgstr "%(user)s,你收到这个消息是因为 %(sender)s 邀请你参与隐蔽话题 “%(thread)s”。"
+msgstr "%(user)s 你好,%(sender)s 邀请你参与隐蔽话题 \"%(thread)s\" 的讨论。因此,我们向你发送这封邮件。"
 
 #: templates/misago/emails/register/complete.html:6
 #: templates/misago/emails/register/complete.txt:6
 #: templates/misago/emails/register/inactive.txt:6
 #, python-format
 msgid "%(user)s, thank you for joining us!"
-msgstr "%(user)s,感谢加入我们!"
+msgstr "%(user)s,感谢加入我们!"
 
 #: templates/misago/emails/register/complete.html:12
 #: templates/misago/emails/register/complete.txt:10
@@ -3204,25 +3283,25 @@ msgstr "你现在可以加入我们论坛的讨论。为什么不花一两分钟
 #: templates/misago/emails/register/complete.html:20
 #, python-format
 msgid "You can always sign in to your account using %(login_form)s."
-msgstr "你可以使用 %(login_form)s 来登录你的论坛账号。"
+msgstr "你可以使用 %(login_form)s 来登录你的账号。"
 
 #: templates/misago/emails/register/complete.txt:14
 msgid "You can always sign in to your account using the form below:"
-msgstr "你可以随时使用以下表单登录你的账号:"
+msgstr "你可以随时使用以下链接登录你的账号:"
 
 #: templates/misago/emails/register/inactive.html:7
 #: templates/misago/emails/register/inactive.txt:10
 msgid ""
 "Before you will be able to join discussion on our forums, one of our "
 "administrators will have to activate your account."
-msgstr "在你可以加入我们论坛的讨论之前,我们的管理员之一必须激活你的账号。"
+msgstr "请耐心等待站点管理员激活你的账户,之后就可以登录并参与话题互动了。"
 
 #: templates/misago/emails/register/inactive.html:12
 #: templates/misago/emails/register/inactive.txt:15
 msgid ""
 "This may take a while, but you will receive e-mail with notification once it"
 " happens."
-msgstr "这可能需要一段时间,但一旦发生,你将收到电子邮件通知。"
+msgstr "这可能需要一点时间,激活之后我们将向你发送一封邮件,请留意邮箱。"
 
 #: templates/misago/emails/register/inactive.html:17
 #: templates/misago/emails/register/inactive.txt:20
@@ -3234,51 +3313,51 @@ msgstr "感谢你的耐心等待,待会见!"
 msgid ""
 "Before you will be able to join discussion on our forums, you have to "
 "activate your account. To do so, simply click the link below:"
-msgstr "在你能够加入我们论坛的讨论之前,你必须激活你的账号。为此,只需点击下面的链接:"
+msgstr "在加入论坛讨论之前,你需要激活你的账号,为此,只需要点击下面的链接:"
 
 #: templates/misago/emails/register/inactive.html:33
 #, python-format
 msgid ""
 "Once your account is activated, you can always sign in to it using "
 "%(login_form)s."
-msgstr "一旦你的账号被激活,你总可以用%(login_form)s登录。"
+msgstr "账号激活之后,你可使用 %(login_form)s 登录。"
 
 #: templates/misago/emails/register/inactive.txt:30
 msgid ""
 "Once your account is activated, you can always sign in to it using the form "
 "below:"
-msgstr "你的账号激活后,你可以通过以下链接登录:"
+msgstr "账号激活后,你可以通过以下链接登录:"
 
 #: templates/misago/emails/thread/reply.html:9
 #, python-format
 msgid ""
 "%(user)s, you are receiving this message because %(sender)s has replied to "
 "the thread %(thread)s that you are subscribed to."
-msgstr "%(user)s%(sender)s 回复了你订阅的话题 %(thread)s 。"
+msgstr "%(user)s, %(sender)s 回复了你订阅的话题 %(thread)s 。"
 
 #: templates/misago/emails/thread/reply.html:14
 #: templates/misago/emails/thread/reply.txt:10
 msgid "To read this reply, click the below link:"
-msgstr "请点击以下链接,阅读此回帖,:"
+msgstr "点击以下链接,即可阅读回复:"
 
 #: templates/misago/emails/thread/reply.html:17
 msgid "Go to reply"
-msgstr "去回"
+msgstr "去回"
 
 #: templates/misago/emails/thread/reply.txt:6
 #, python-format
 msgid ""
 "%(user)s, you are receiving this message because %(sender)s has replied to "
 "the thread \"%(thread)s\" that you are subscribed to."
-msgstr "%(user)s,%(sender)s 回复了你订阅的话题 “%(thread)s”。"
+msgstr "%(user)s,%(sender)s 回复了你订阅的话题 \"%(thread)s\"。"
 
 #: templates/misago/errorpages/403.html:50
 msgid "This page is not available."
-msgstr "这个页面不可用。"
+msgstr "此页面不存在。"
 
 #: templates/misago/errorpages/404.html:38
 msgid "Requested page could not be found."
-msgstr "请求的页面未找到"
+msgstr "请求的页面未找到."
 
 #: templates/misago/errorpages/404.html:39
 msgid ""
@@ -3300,16 +3379,16 @@ msgstr "该页面应通过表单提交或按按钮来访问。"
 
 #: templates/misago/errorpages/405.html:38
 msgid "Page reached in wrong way."
-msgstr "页面达到了错误的方式。"
+msgstr "无法直接访问此页面。"
 
 #: templates/misago/errorpages/ban_message.html:15
 #, python-format
 msgid "This ban expires on %(expires_on)s."
-msgstr "此封禁 %(expires_on)s 过期。"
+msgstr "此封禁将在 %(expires_on)s 过期。"
 
 #: templates/misago/errorpages/ban_message.html:19
 msgid "This ban is permanent."
-msgstr "此封禁是永久的。"
+msgstr "永久封禁。"
 
 #: templates/misago/errorpages/banned.html:5
 msgid "You are banned"
@@ -3333,7 +3412,7 @@ msgstr "这通常是由你的浏览器不接受或使用过时的 Cookie 引起
 #: templates/misago/errorpages/csrf_failure.html:24
 #: templates/misago/errorpages/csrf_failure_authenticated.html:19
 msgid "Suspicious request blocked."
-msgstr "可疑请求已被拦截。"
+msgstr "可疑请求已被拦截。"
 
 #: templates/misago/errorpages/csrf_failure.html:25
 #: templates/misago/errorpages/csrf_failure_authenticated.html:20
@@ -3356,11 +3435,11 @@ msgstr "登录故障"
 #: templates/misago/errorpages/social.html:38
 msgid ""
 "Please try again or use another method to sign in if the problem persists."
-msgstr "请重新登录,如果依然出现故障尝试换一种快捷登录方式。"
+msgstr "请重新登录,如果依然出现故障尝试换一种登录方式。"
 
 #: templates/misago/footer.html:9
 msgid "For complete experience please enable JavaScript."
-msgstr "要获得完整体验,请启用 JavaScript。"
+msgstr "要获得完整体验,请启用JavaScript。"
 
 #: templates/misago/forgottenpassword/error.html:7
 msgid "Set new password error"
@@ -3368,7 +3447,7 @@ msgstr "设置新密码发生错误"
 
 #: templates/misago/forgottenpassword/error.html:9
 msgid "Change forgotten password error"
-msgstr "更改忘记的密码错误"
+msgstr "修改密码错误"
 
 #: templates/misago/forgottenpassword/error.html:26
 msgid "Can't set new password."
@@ -3376,14 +3455,14 @@ msgstr "无法设置新密码。"
 
 #: templates/misago/forgottenpassword/error.html:28
 msgid "Can't change forgotten password."
-msgstr "无法更改忘记的密码。"
+msgstr "无法修改密码。"
 
 #: templates/misago/forgottenpassword/form.html:9
 #: templates/misago/forgottenpassword/form.html:22
 #: templates/misago/forgottenpassword/request.html:9
 #: templates/misago/forgottenpassword/request.html:22
 msgid "Change forgotten password"
-msgstr "更改忘记密码"
+msgstr "忘记密码"
 
 #: templates/misago/forgottenpassword/form.html:42
 msgid "To reset your password please enable JavaScript."
@@ -3393,14 +3472,14 @@ msgstr "要重设密码,请启用 JavaScript。"
 msgid ""
 "Your user account has no password set for it because it was created with "
 "other service."
-msgstr "你的账户未设置密码,因为你使用快捷登录创建的账号。"
+msgstr "你的账户未设置密码,因为你使用快捷方式创建的账号。"
 
 #: templates/misago/forgottenpassword/request.html:36
 msgid ""
 "To set password for your account, you can use special secure form that will "
 "be available by special link valid only for your browser, for seven days or "
 "until your password is set."
-msgstr "要为你的帐户设置密码,你可以使用特殊的安全表单,该表单将通过仅对你的浏览器有效的特殊链接提供,链接有效期7天,请尽快设置。"
+msgstr "要为你的账号设置密码,你可以使用特殊的安全表单,该表单将通过仅对你的浏览器有效的特殊链接提供,链接有效期7天,请尽快设置。"
 
 #: templates/misago/forgottenpassword/request.html:38
 msgid ""
@@ -3414,24 +3493,24 @@ msgid ""
 "Instead, you can change your password using special secure form that will be"
 " available by special link valid only for your browser, for seven days or "
 "until your password is changed."
-msgstr "你可以在通过安全密码重置链接来修改密码,链接有效期7天。"
+msgstr "你可以在通过仅对你浏览器有效的安全密码重置链接来修改密码,链接有效期7天,请尽快修改。"
 
 #: templates/misago/forgottenpassword/request.html:60
 msgid "To request new password reset link please enable JavaScript."
-msgstr "要申请新的密码重置链接,请启用 JavaScript。"
+msgstr "要申请新的密码重置链接,请启用JavaScript。"
 
 #: templates/misago/options/credentials_changed.html:5
 #: templates/misago/options/credentials_error.html:5
 msgid "Change sign-in credentials"
-msgstr "改登录凭据"
+msgstr "改登录凭据"
 
 #: templates/misago/options/credentials_changed.html:20
 msgid "From now you will need to use new credentials when signing in."
-msgstr "从现在开始,你将需要在登录时使用新的凭据。"
+msgstr "从现在起,你需要在登录时使用新凭据。"
 
 #: templates/misago/options/credentials_error.html:19
 msgid "Change confirmation link is invalid."
-msgstr "改确认链接无效。"
+msgstr "改确认链接无效。"
 
 #: templates/misago/options/credentials_error.html:20
 msgid ""
@@ -3441,7 +3520,7 @@ msgstr "确认链接属于其他用户,已被使用或已过期。"
 
 #: templates/misago/options/noscript.html:5
 msgid "Change your options"
-msgstr "改你的选项"
+msgstr "改你的选项"
 
 #: templates/misago/options/noscript.html:20
 #: templates/misago/socialauth.html:22
@@ -3450,11 +3529,11 @@ msgstr "启用 JavaScript"
 
 #: templates/misago/options/noscript.html:21
 msgid "You need to enable JavaScript in your browser to change your options."
-msgstr "你需要在浏览器中启用 JavaScript 才能更改你的选项。"
+msgstr "你需要在浏览器中启用 JavaScript 才能更改你的设定。"
 
 #: templates/misago/participants.html:30
 msgid "Add participant"
-msgstr "新增参与者"
+msgstr "添加参与者"
 
 #: templates/misago/participants.html:36
 #, python-format
@@ -3480,13 +3559,13 @@ msgstr "投票是公开的。"
 #: templates/misago/poll/info.html:36
 #, python-format
 msgid "Posted by %(poster)s on %(posted_on)s."
-msgstr "%(poster)s 发表于 %(posted_on)s"
+msgstr "%(poster)s 发表于 %(posted_on)s."
 
 #: templates/misago/poll/results.html:21 templates/misago/poll/results.html:31
 #, python-format
 msgid "%(votes)s vote, %(proc)s%% of total."
 msgid_plural "%(votes)s votes, %(proc)s%% of total."
-msgstr[0] "%(votes)s票,占总数的%(proc)s%%。"
+msgstr[0] "%(votes)s 票,占总数的 %(proc)s%%。"
 
 #: templates/misago/poll/results.html:41
 msgid "Your choice."
@@ -3508,7 +3587,7 @@ msgstr[0] "你可以选择 %(choices)s 个选项。"
 
 #: templates/misago/poll/voting.html:32
 msgid "You can change your vote later."
-msgstr "之后你可以更改你的投票。"
+msgstr "稍后你可以修改你的投票。"
 
 #: templates/misago/poll/voting.html:36
 msgid "Votes are final."
@@ -3516,7 +3595,7 @@ msgstr "投票不可更改。"
 
 #: templates/misago/poll/voting.html:46
 msgid "Save your vote"
-msgstr "保存你的投票"
+msgstr "保存投票"
 
 #: templates/misago/poll/voting.html:51
 msgid "See results"
@@ -3525,17 +3604,17 @@ msgstr "查看结果"
 #: templates/misago/profile/ban_details.html:5
 #: templates/misago/profile/ban_details.html:8
 #: templates/misago/profile/ban_details.html:9
-#: templates/misago/profile/ban_details.html:16 users/apps.py:129
+#: templates/misago/profile/ban_details.html:16 users/apps.py:137
 msgid "Ban details"
 msgstr "封禁细节"
 
 #: templates/misago/profile/ban_details.html:22
 msgid "User-shown ban message"
-msgstr "显示给用户的封禁息"
+msgstr "显示给用户的封禁息"
 
 #: templates/misago/profile/ban_details.html:31
 msgid "Team-shown ban message"
-msgstr "显示给团队的封禁消息"
+msgstr "显示给管理团队的封禁讯息"
 
 #: templates/misago/profile/ban_details.html:39
 msgid "Ban expiration"
@@ -3544,12 +3623,12 @@ msgstr "封禁到期"
 #: templates/misago/profile/ban_details.html:43
 #, python-format
 msgid "%(username)s's ban expires on %(expires_on)s."
-msgstr "%(username)s 的封禁于 %(expires_on)s 到期。"
+msgstr "%(username)s 的封禁于 %(expires_on)s 到期。"
 
 #: templates/misago/profile/ban_details.html:47
 #, python-format
 msgid "%(username)s's ban is permanent."
-msgstr "%(username)s 的封禁是永久的。"
+msgstr "%(username)s 已永久封禁。"
 
 #: templates/misago/profile/base.html:9 templates/misago/profile/base.html:20
 #: templates/misago/profile/base.html:35
@@ -3561,29 +3640,29 @@ msgstr "%(title)s, 加入于 %(joined_on)s。"
 #, python-format
 msgid "Wrote %(posts)s post."
 msgid_plural "Wrote %(posts)s posts."
-msgstr[0] "已发 %(posts)s 个帖子。"
+msgstr[0] "已发表 %(posts)s 条帖子。"
 
 #: templates/misago/profile/base.html:26 templates/misago/profile/base.html:41
 #, python-format
 msgid "Started %(threads)s thread."
 msgid_plural "Started %(threads)s threads."
-msgstr[0] "已发起 %(threads)s 话题。"
+msgstr[0] "已发起 %(threads)s 话题。"
 
 #: templates/misago/profile/details.html:5
 #: templates/misago/profile/details.html:8
 #: templates/misago/profile/details.html:9
-#: templates/misago/profile/details.html:19 users/apps.py:116
+#: templates/misago/profile/details.html:19 users/apps.py:124
 msgid "Details"
-msgstr "详"
+msgstr "详细资料"
 
 #: templates/misago/profile/details.html:75
 msgid "You are not sharing any details with others."
-msgstr "你没有与其他用户分享任何详情。"
+msgstr "你没有分享信息给站内成员。"
 
 #: templates/misago/profile/details.html:77
 #, python-format
 msgid "%(username)s is not sharing any details with others."
-msgstr "%(username)s 没有与其他用户分享任何详情。"
+msgstr "%(username)s 什么也没有分享。"
 
 #: templates/misago/profile/feed.html:10
 msgid "See post"
@@ -3597,11 +3676,11 @@ msgstr "此帖的内容无法显示。"
 #: templates/misago/profile/feed.html:62
 #: templates/misago/thread/posts/post/body.html:11
 msgid "This error is caused by invalid post content manipulation."
-msgstr "此错误是由无效的帖子内容操作引起的。"
+msgstr "此错误是由违规的操作引起的。"
 
 #: templates/misago/profile/followers.html:5
 #: templates/misago/profile/followers.html:8
-#: templates/misago/profile/followers.html:9 users/apps.py:104
+#: templates/misago/profile/followers.html:9 users/apps.py:112
 msgid "Followers"
 msgstr "关注者"
 
@@ -3628,7 +3707,7 @@ msgstr "%(username)s 没有关注者。"
 
 #: templates/misago/profile/follows.html:5
 #: templates/misago/profile/follows.html:8
-#: templates/misago/profile/follows.html:9 users/apps.py:110
+#: templates/misago/profile/follows.html:9 users/apps.py:118
 msgid "Follows"
 msgstr "关注"
 
@@ -3659,58 +3738,58 @@ msgstr "此用户正在删除其帐号。"
 
 #: templates/misago/profile/header.html:9
 msgid "This user's account has been disabled by administrator."
-msgstr "此用户的号已被管理员禁用。"
+msgstr "此用户的号已被管理员禁用。"
 
 #: templates/misago/profile/header.html:46
 #, python-format
 msgid "Member since %(joined_on)s"
-msgstr "%(joined_on)s 后加入的论坛成员"
+msgstr "用户加入于 %(joined_on)s"
 
 #: templates/misago/profile/posts.html:20
 #, python-format
 msgid "You have posted %(posts)s message."
 msgid_plural "You have posted %(posts)s messages."
-msgstr[0] "你已经发布了 %(posts)s 帖子。"
+msgstr[0] "你已经发布了 %(posts)s 帖子。"
 
 #: templates/misago/profile/posts.html:26
 #, python-format
 msgid "%(username)s has posted %(posts)s message."
 msgid_plural "%(username)s has posted %(posts)s messages."
-msgstr[0] "%(username)s 已经发布了 %(posts)s 个帖子。"
+msgstr[0] "%(username)s 已发布了 %(posts)s 条帖子。"
 
 #: templates/misago/profile/posts.html:40
 msgid "You have posted no messages"
-msgstr "你没有发表任何帖子"
+msgstr "你还没有发表过帖子"
 
 #: templates/misago/profile/posts.html:42
 #, python-format
 msgid "%(username)s posted no messages."
-msgstr "%(username)s 没有发布任何帖子。"
+msgstr "%(username)s 还没有发布过帖子。"
 
 #: templates/misago/profile/threads.html:20
 #, python-format
 msgid "You have started %(threads)s thread."
 msgid_plural "You have started %(threads)s threads."
-msgstr[0] "你已经发起 %(threads)s 个话题。"
+msgstr[0] "你已经发起%(threads)s 个话题。"
 
 #: templates/misago/profile/threads.html:26
 #, python-format
 msgid "%(username)s has started %(threads)s thread."
 msgid_plural "%(username)s has started %(threads)s threads."
-msgstr[0] "%(username)s 已发起 %(threads)s 个话题。"
+msgstr[0] "%(username)s 已发起 %(threads)s 个话题。"
 
 #: templates/misago/profile/threads.html:40
 msgid "You have no started threads."
-msgstr "你没有发起任何话题。"
+msgstr "你还没有发起过话题。"
 
 #: templates/misago/profile/threads.html:42
 #, python-format
 msgid "%(username)s started no threads."
-msgstr "%(username)s 没有发起任何话题。"
+msgstr "%(username)s 还没有发起过话题。"
 
 #: templates/misago/profile/username_history.html:5
 #: templates/misago/profile/username_history.html:8
-#: templates/misago/profile/username_history.html:9 users/apps.py:122
+#: templates/misago/profile/username_history.html:9 users/apps.py:130
 msgid "Username history"
 msgstr "用户名历史记录"
 
@@ -3718,27 +3797,27 @@ msgstr "用户名历史记录"
 #, python-format
 msgid "Your username was changed %(changes)s time."
 msgid_plural "Your username was changed %(changes)s times."
-msgstr[0] "你的用户名已经改变 %(changes)s 次。"
+msgstr[0] "你的用户名已修改 %(changes)s 次。"
 
 #: templates/misago/profile/username_history.html:24
 #, python-format
 msgid "%(username)s's username was changed %(changes)s time."
 msgid_plural "%(username)s's username was changed %(changes)s times."
-msgstr[0] "%(username)s 的用户名已经改变 %(changes)s 次。"
+msgstr[0] "%(username)s 的用户名已修改 %(changes)s 次。"
 
 #: templates/misago/profile/username_history.html:79
 msgid "Your username was never changed."
-msgstr "你的用户名从未改。"
+msgstr "你的用户名从未改。"
 
 #: templates/misago/profile/username_history.html:81
 #, python-format
 msgid "%(username)s's username was never changed."
-msgstr "%(username)s 的用户名从未改。"
+msgstr "%(username)s 的用户名从未改。"
 
 #: templates/misago/required_agreement.html:9
 #, python-format
 msgid "Please review the updated %(agreement)s:"
-msgstr "请查看更新后的 %(agreement)s:"
+msgstr "请查看更新后的 %(agreement)s"
 
 #: templates/misago/required_agreement.html:19
 msgid "here"
@@ -3774,24 +3853,24 @@ msgstr "你需要启用浏览器的 JavaScript 支持,才能使用 %(backend)s
 #, python-format
 msgid "There is %(more)s more post in this thread."
 msgid_plural "There are %(more)s more posts in this thread."
-msgstr[0] "该话题中还有 %(more)s 个帖子。"
+msgstr[0] "此话题中还有 %(more)s 条帖子。"
 
 #: templates/misago/thread/paginator.html:47
 msgid "There are no more posts in this thread."
-msgstr "这个话题中没有其他帖子。"
+msgstr "此话题中帖子已全部显示。"
 
 #: templates/misago/thread/posts/event/index.html:48
 #, python-format
 msgid "Thread title has been changed from %(old_title)s."
-msgstr "话题名称已从 %(old_title)s 改。"
+msgstr "话题名称已从 %(old_title)s 改。"
 
 #: templates/misago/thread/posts/event/index.html:52
 msgid "Thread has been pinned globally."
-msgstr "话题已全局置顶。"
+msgstr "话题已设为全局置顶。"
 
 #: templates/misago/thread/posts/event/index.html:54
 msgid "Thread has been pinned locally."
-msgstr "话题已在版块内置顶。"
+msgstr "话题已设为版块置顶。"
 
 #: templates/misago/thread/posts/event/index.html:56
 msgid "Thread has been unpinned."
@@ -3800,12 +3879,12 @@ msgstr "话题已取消置顶。"
 #: templates/misago/thread/posts/event/index.html:61
 #, python-format
 msgid "Thread has been moved from %(from_category)s."
-msgstr "话题已从版块 %(from_category)s 中移动。"
+msgstr "话题已从 %(from_category)s 中移出。"
 
 #: templates/misago/thread/posts/event/index.html:68
 #, python-format
 msgid "The %(merged_thread)s thread has been merged into this thread."
-msgstr "%(merged_thread)s 话题已经被合并到这个话题中。"
+msgstr "话题 %(merged_thread)s 已被合并到此话题中。"
 
 #: templates/misago/thread/posts/event/index.html:72
 msgid "Thread has been approved."
@@ -3813,15 +3892,15 @@ msgstr "话题已通过审批。"
 
 #: templates/misago/thread/posts/event/index.html:74
 msgid "Thread has been opened."
-msgstr "话题已经打开。"
+msgstr "话题已开。"
 
 #: templates/misago/thread/posts/event/index.html:76
 msgid "Thread has been closed."
-msgstr "话题已关闭。"
+msgstr "话题已关闭。"
 
 #: templates/misago/thread/posts/event/index.html:78
 msgid "Thread has been revealed."
-msgstr "话题已经被重现。"
+msgstr "话题已可见。"
 
 #: templates/misago/thread/posts/event/index.html:80
 msgid "Thread has been made hidden."
@@ -3833,46 +3912,46 @@ msgstr "接管话题。"
 
 #: templates/misago/thread/posts/event/index.html:84
 msgid "Owner has left thread. This thread is now closed."
-msgstr "所有者离开了话题,帖子现在已经被关闭。"
+msgstr "所有者已离开话题。此话题现已关闭。"
 
 #: templates/misago/thread/posts/event/index.html:86
 msgid "Participant has left thread."
-msgstr "参与者离开了话题。"
+msgstr "参与者已离开话题."
 
 #: templates/misago/thread/posts/event/index.html:91
 #, python-format
 msgid "Changed thread owner to %(user)s."
-msgstr "更话题所有者为 %(user)s。"
+msgstr "更话题所有者为 %(user)s。"
 
 #: templates/misago/thread/posts/event/index.html:98
 #, python-format
 msgid "Added %(user)s to thread."
-msgstr "把 %(user)s 加入话题。"
+msgstr "已添加 %(user)s 到话题。"
 
 #: templates/misago/thread/posts/event/index.html:105
 #, python-format
 msgid "Removed %(user)s from thread."
-msgstr "从话题中移除 %(user)s。"
+msgstr "已从话题删除 %(user)s。"
 
 #: templates/misago/thread/posts/event/info.html:12
 #: templates/misago/thread/posts/post/body-hidden.html:14
 #, python-format
 msgid "Hidden by %(hidden_by)s on %(hidden_on)s."
-msgstr "%(hidden_by)s 隐藏于 %(hidden_on)s。"
+msgstr "%(hidden_by)s 隐藏于 %(hidden_on)s。"
 
 #: templates/misago/thread/posts/event/info.html:28
 #, python-format
 msgid "By %(event_by)s on %(event_on)s."
-msgstr "%(event_by)s 于 %(event_on)s."
+msgstr "%(event_by)s 于 %(event_on)s."
 
 #: templates/misago/thread/posts/post/attachments.html:33
 #, python-format
 msgid "%(filetype)s, %(size)s, uploaded by %(uploader)s on %(uploaded_on)s."
-msgstr "%(filetype)s,%(size)s,%(uploader)s 上传于 %(uploaded_on)s。"
+msgstr "%(filetype)s, %(size)s, %(uploader)s上传于%(uploaded_on)s。"
 
 #: templates/misago/thread/posts/post/body-hidden.html:4
 msgid "This post is hidden. You cannot not see its contents."
-msgstr "这个帖子是隐藏的。你看不到它的内容。"
+msgstr "这条帖子已被隐藏。你无法查看内容。"
 
 #: templates/misago/thread/posts/post/flags.html:7
 #, python-format
@@ -3886,7 +3965,7 @@ msgstr "%(marked_by)s 在 %(marked_on)s 将此贴设为最佳答案。"
 
 #: templates/misago/thread/posts/post/flags.html:23
 msgid "This post is hidden. Only users with permission may see its contents."
-msgstr "这帖子是隐藏的。只有拥有相应权限的用户才能看到其内容。"
+msgstr "这帖子是隐藏的。只有拥有相应权限的用户才能看到其内容。"
 
 #: templates/misago/thread/posts/post/flags.html:29
 msgid ""
@@ -3896,11 +3975,11 @@ msgstr "此帖子未审批。只有拥有审批帖子权限的用户及作者才
 
 #: templates/misago/thread/posts/post/flags.html:35
 msgid "This post is protected. Only moderators may change it."
-msgstr "此帖被保护。只有版主可以改变它。"
+msgstr "此贴已锁定,只有版主可修改。"
 
 #: templates/misago/thread/posts/post/footer.html:7
 msgid "Liked"
-msgstr "赞"
+msgstr "赞"
 
 #: templates/misago/thread/posts/post/footer.html:9
 msgid "Like"
@@ -3908,7 +3987,7 @@ msgstr "赞"
 
 #: templates/misago/thread/posts/post/footer.html:26
 msgid "Reply"
-msgstr "回"
+msgstr "回"
 
 #: templates/misago/thread/posts/post/header.html:5
 msgid "New post"
@@ -3927,7 +4006,7 @@ msgstr "发布链接"
 
 #: templates/misago/thread/posts/post/side.html:73
 msgid "Removed user"
-msgstr "被移除用户"
+msgstr "已移除的用户"
 
 #: templates/misago/thread/stats.html:11
 #: templates/misago/threadslist/thread.html:21
@@ -3954,7 +4033,7 @@ msgstr "未审批的帖子"
 #: templates/misago/thread/stats.html:49
 #: templates/misago/threadslist/thread.html:119
 msgid "Hidden"
-msgstr "隐藏"
+msgstr "隐藏"
 
 #: templates/misago/thread/stats.html:59
 #: templates/misago/threadslist/thread.html:129
@@ -3966,12 +4045,12 @@ msgstr "已关闭"
 #, python-format
 msgid "%(replies)s reply"
 msgid_plural "%(replies)s replies"
-msgstr[0] "%(replies)s 条回"
+msgstr[0] "%(replies)s 条回"
 
 #: templates/misago/thread/stats.html:83
 #, python-format
 msgid "last reply by %(user)s %(date)s"
-msgstr "%(user)s 于 %(date)s 最后回帖"
+msgstr "%(user)s 最后回复于 %(date)s"
 
 #: templates/misago/thread/thread.html:19
 #: templates/misago/thread/thread.html:30
@@ -3984,7 +4063,7 @@ msgstr "由 %(starter)s 于 %(started_on)s 在 %(category)s 版块中发起。"
 #, python-format
 msgid "%(replies)s reply, last one from %(last_post_on)s."
 msgid_plural "%(replies)s replies, last one from %(last_post_on)s."
-msgstr[0] "%(replies)s 条回帖,最后一条发布于 %(last_post_on)s。"
+msgstr[0] "%(replies)s 条回复,最后回复于 %(last_post_on)s。"
 
 #: templates/misago/thread/thread.html:25
 #: templates/misago/thread/thread.html:36
@@ -3998,55 +4077,55 @@ msgstr "已关闭。"
 
 #: templates/misago/thread/toolbar-top.html:6
 msgid "Go to first new post"
-msgstr "去往第一个帖子"
+msgstr "跳转到第一条新帖子"
 
 #: templates/misago/thread/toolbar-top.html:13
 msgid "Go to first unapproved post"
-msgstr "前往第一条未审批的帖子"
+msgstr "跳转到第一条未审批的帖子"
 
 #: templates/misago/thread/toolbar-top.html:19
 msgid "Go to last post"
-msgstr "前往最后一条回帖"
+msgstr "跳转到最后一条回复"
 
 #: templates/misago/thread/toolbar-top.html:25
 msgid "Go to best answers"
-msgstr "转到最佳答案"
+msgstr "转到最佳答案"
 
 #: templates/misago/thread/toolbar-top.html:26
 msgid "Best answer"
 msgstr "最佳答案"
 
-#: templates/misago/threadslist/base.html:58
+#: templates/misago/threadslist/base.html:57
 msgid "There are no threads in this category."
 msgstr "此版块中无话题。"
 
-#: templates/misago/threadslist/base.html:60
+#: templates/misago/threadslist/base.html:59
 msgid "There are no threads on this forum... yet!"
 msgstr "目前此论坛中还没有任何话题!"
 
-#: templates/misago/threadslist/base.html:64
-#: templates/misago/threadslist/private_threads.html:67
+#: templates/misago/threadslist/base.html:63
+#: templates/misago/threadslist/private_threads.html:61
 msgid "Why not start one yourself?"
-msgstr "你为什么不发一条呢?"
+msgstr "为什么不发起一个话题呢?"
 
-#: templates/misago/threadslist/base.html:68
-#: templates/misago/threadslist/private_threads.html:70
+#: templates/misago/threadslist/base.html:67
+#: templates/misago/threadslist/private_threads.html:64
 msgid "No threads matching specified criteria were found."
-msgstr "没有找到匹配指定条件的话题。"
+msgstr "没有找到符合标准的话题。"
 
-#: templates/misago/threadslist/base.html:83
+#: templates/misago/threadslist/base.html:82
 msgid "Next page"
 msgstr "下一页"
 
-#: templates/misago/threadslist/private_threads.html:48
+#: templates/misago/threadslist/private_threads.html:42
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
-msgstr "隐蔽话题只有那些创建和被邀请的人可以浏览和参与。"
+msgstr "仅发起者和被邀请者可以查看和参与隐蔽话题。"
 
-#: templates/misago/threadslist/private_threads.html:64
+#: templates/misago/threadslist/private_threads.html:58
 msgid "You aren't participating in any private threads."
-msgstr "你没有参与任何隐蔽话题。"
+msgstr "你没有参与隐蔽话题。"
 
 #: templates/misago/threadslist/tabs.html:7 threads/admin/forms.py:27
 msgid "All"
@@ -4066,7 +4145,7 @@ msgstr "订阅"
 
 #: templates/misago/threadslist/thread.html:11
 msgid "New posts"
-msgstr "新职位"
+msgstr "新帖子"
 
 #: templates/misago/threadslist/thread.html:59
 msgid "Answered"
@@ -4078,7 +4157,7 @@ msgstr "投票"
 
 #: templates/misago/userslists/active_posters.html:5
 #: templates/misago/userslists/active_posters.html:23
-#: templates/misago/userslists/active_posters.html:24 users/apps.py:73
+#: templates/misago/userslists/active_posters.html:24 users/apps.py:81
 msgid "Top posters"
 msgstr "活跃用户"
 
@@ -4086,7 +4165,7 @@ msgstr "活跃用户"
 #, python-format
 msgid "%(posters)s most active poster from last %(days)s days."
 msgid_plural "%(posters)s most active posters from last %(days)s days."
-msgstr[0] "%(posters)s 是最近 %(days)s 天中最活跃的发布者。"
+msgstr[0] "过去 %(days)s 天最活跃的 %(posters)s 名用户。"
 
 #: templates/misago/userslists/active_posters.html:16
 #: templates/misago/userslists/active_posters.html:35
@@ -4107,7 +4186,7 @@ msgstr[0] "过去 %(days)s 天最活跃的 %(posters)s 名用户。"
 #: templates/misago/userslists/active_posters.html:116
 #: templates/misago/userslists/active_posters.html:128
 msgid "Ranked posts"
-msgstr "级别帖子"
+msgstr "级别帖子"
 
 #: templates/misago/userslists/active_posters.html:133
 msgid "Total posts"
@@ -4409,15 +4488,15 @@ msgstr "状态"
 
 #: threads/admin/forms.py:28
 msgid "Only orphaned"
-msgstr "附件所在帖子被删除"
+msgstr "未附加"
 
 #: threads/admin/forms.py:29
 msgid "Not orphaned"
-msgstr "附件所在帖子未被删除"
+msgstr "已附加"
 
 #: threads/admin/forms.py:54
 msgid "Type name"
-msgstr "附件类型名称"
+msgstr "类型名称"
 
 #: threads/admin/forms.py:55
 msgid "File extensions"
@@ -4429,11 +4508,11 @@ msgstr "最大允许上传的大小"
 
 #: threads/admin/forms.py:59
 msgid "Limit uploads to"
-msgstr "将上传权限限制于"
+msgstr "可上传的用户权限"
 
 #: threads/admin/forms.py:60
 msgid "Limit downloads to"
-msgstr "将下载权限限制于"
+msgstr "可下载的用户权限"
 
 #: threads/admin/forms.py:64
 msgid ""
@@ -4455,7 +4534,7 @@ msgstr "此类型的最大允许上传的文件大小,以KB为单位。该限
 
 #: threads/admin/forms.py:75
 msgid "Controls this attachment type availability on your site."
-msgstr "在你的网站上控制此类型的附件的可用性(权限)。"
+msgstr "控制附件类型在网站的可见性。"
 
 #: threads/admin/forms.py:77
 msgid ""
@@ -4464,7 +4543,7 @@ msgid ""
 "to allow all users with permission to upload attachments to be able to "
 "upload attachments of this type."
 msgstr ""
-"如果你希望仅限特定身份的用户上传此类型的文件,请在此列表中选中这些身份。若不选择任何身份,则允许所有拥有上传附件权限的用户上传该类型的附件。"
+"如果你希望仅限特定身份的用户上传此类型的文件,请在此列表中选中这些身份。若不选择任何身份,则允许所有拥有上传附件权限的用户上传该类型的附件。"
 
 #: threads/admin/forms.py:83
 msgid ""
@@ -4473,7 +4552,7 @@ msgid ""
 "to allow all users with permission to download attachments to be able to "
 "download attachments of this type."
 msgstr ""
-"如果你希望仅限特定身份的用户下载此类型的文件,请在此列表中选中这些身份。若不选择任何身份,则允许所有拥有下载附件权限的用户下载该类型的附件。"
+"如果你希望仅限特定身份的用户下载此类型的文件,请在此列表中选中这些身份。若不选择任何身份,则允许所有拥有下载附件权限的用户下载该类型的附件。"
 
 #: threads/admin/views/attachments.py:14
 msgid "Requested attachment could not be found."
@@ -4482,12 +4561,12 @@ msgstr "无法找到请求的附件。"
 #: threads/admin/views/attachments.py:28 users/admin/views/bans.py:26
 #: users/admin/views/users.py:64
 msgid "A to z"
-msgstr "用户名A到z"
+msgstr "A到z"
 
 #: threads/admin/views/attachments.py:29 users/admin/views/bans.py:27
 #: users/admin/views/users.py:65
 msgid "Z to a"
-msgstr "Z  a"
+msgstr "Z到a"
 
 #: threads/admin/views/attachments.py:30
 msgid "Smallest files"
@@ -4499,7 +4578,7 @@ msgstr "最大文件"
 
 #: threads/admin/views/attachments.py:33
 msgid "With attachments: 0"
-msgstr "附件:0"
+msgstr "已选附件:0"
 
 #: threads/admin/views/attachments.py:34
 msgid "Select attachments"
@@ -4520,33 +4599,33 @@ msgstr "已删除所选附件。"
 #: threads/admin/views/attachments.py:83
 #, python-format
 msgid "Attachment \"%(filename)s\" has been deleted."
-msgstr "附件 “%(filename)s” 已经被删除。"
+msgstr "已删除附件 \"%(filename)s\" 。"
 
 #: threads/admin/views/attachmenttypes.py:15
 msgid "Requested attachment type could not be found."
-msgstr "无法找到请求的附件。"
+msgstr "无法找到请求的附件类型。"
 
 #: threads/admin/views/attachmenttypes.py:36
 #, python-format
 msgid "New type \"%(name)s\" has been saved."
-msgstr "已保存新类型 “%(name)s”。"
+msgstr "已保存新类型 \"%(name)s\"。"
 
 #: threads/admin/views/attachmenttypes.py:40
 #, python-format
 msgid "Attachment type \"%(name)s\" has been edited."
-msgstr "附件类型 “%(name)s” 已经被编辑。"
+msgstr "已编辑附件类型 \"%(name)s\"。"
 
 #: threads/admin/views/attachmenttypes.py:47
 #, python-format
 msgid ""
 "Attachment type \"%(name)s\" has associated attachments and can't be "
 "deleted."
-msgstr "附件类型 “%(name)s” 已经关联了附件,不能被删除。"
+msgstr "附件类型 \"%(name)s\" 已经关联了附件,不能被删除。"
 
 #: threads/admin/views/attachmenttypes.py:54
 #, python-format
 msgid "Attachment type \"%(name)s\" has been deleted."
-msgstr "已删除附件类型 “%(name)s”。"
+msgstr "已删除附件类型 \"%(name)s\"。"
 
 #: threads/api/attachments.py:18
 msgid "You don't have permission to upload new files."
@@ -4554,11 +4633,11 @@ msgstr "你没有上传新文件的权限。"
 
 #: threads/api/attachments.py:28
 msgid "No file has been uploaded."
-msgstr "没有上传文件。"
+msgstr "未上传文件"
 
 #: threads/api/attachments.py:48
 msgid "Uploaded image was corrupted or invalid."
-msgstr "上传的图已损坏或无效。"
+msgstr "上传的图已损坏或无效。"
 
 #: threads/api/attachments.py:86
 msgid "You can't upload files of this type."
@@ -4568,30 +4647,30 @@ msgstr "你无法上传此类型的文件。"
 #, python-format
 msgid ""
 "You can't upload files larger than %(limit)s (your file has %(upload)s)."
-msgstr "你不能上传大于 %(limit)s 的文件(你的文件有 %(upload)s)。"
+msgstr "你不能上传大于%(limit)s的文件(你的文件有%(upload)s)。"
 
 #: threads/api/attachments.py:104
 #, python-format
 msgid ""
 "You can't upload files of this type larger than %(limit)s (your file has "
 "%(upload)s)."
-msgstr "你不能上传大于 %(limit)s 的此类型的文件(你的文件有 %(upload)s)。"
+msgstr "你不能上传大于%(limit)s的此类型的文件(你的文件有%(upload)s)。"
 
 #: threads/api/postendpoints/edits.py:87
 msgid "Edits record is unavailable for this post."
-msgstr "此帖子无法编辑记录。"
+msgstr "编辑记录不可用。"
 
 #: threads/api/postendpoints/merge.py:11
 msgid "You can't merge posts in this thread."
-msgstr "你不能在此话题中合并帖子。"
+msgstr "你不能合并此话题中的帖子。"
 
 #: threads/api/postendpoints/move.py:10
 msgid "You can't move posts in this thread."
-msgstr "你不能在此话题中移动帖子。"
+msgstr "你不能移动此话题中的帖子。"
 
 #: threads/api/postendpoints/patch_post.py:36
 msgid "You can't like posts in this category."
-msgstr "你不能赞这个版块的帖子。"
+msgstr "你不能赞此版块中的帖子。"
 
 #: threads/api/postendpoints/patch_post.py:99
 #: threads/api/threadendpoints/patch.py:147
@@ -4600,17 +4679,17 @@ msgstr "内容审批不能撤销。"
 
 #: threads/api/postendpoints/patch_post.py:180
 msgid "One or more posts to update could not be found."
-msgstr "无法找到更新的一个或多个帖子。"
+msgstr "无法找到更新的帖子。"
 
 #: threads/api/postendpoints/patch_post.py:198
 #, python-format
 msgid "No more than %(limit)s post can be updated at a single time."
 msgid_plural "No more than %(limit)s posts can be updated at a single time."
-msgstr[0] "一次最多可以更新 %(limit)s 帖子。"
+msgstr[0] "一次最多可以更新 %(limit)s 帖子。"
 
 #: threads/api/postendpoints/split.py:12
 msgid "You can't split posts from this thread."
-msgstr "你不能从这个话题拆分帖子。"
+msgstr "你不能从这个话题拆分帖子。"
 
 #: threads/api/postingendpoint/attachments.py:63
 #, python-format
@@ -4625,35 +4704,35 @@ msgid ""
 msgid_plural ""
 "You can't attach more than %(limit_value)s flies to single post (added "
 "%(show_value)s)."
-msgstr[0] "每个帖子最多可添加 %(limit_value)s 个附件(现有 %(show_value)s 个)。"
+msgstr[0] "每条帖子最多可添加 %(limit_value)s 个附件(已添加 %(show_value)s 个)。"
 
 #: threads/api/postingendpoint/category.py:45
 msgid "You have to select category to post thread in."
-msgstr "你必须选择版块来发帖。"
+msgstr "请选择一个版块。"
 
 #: threads/api/postingendpoint/category.py:46
 #: threads/api/postingendpoint/category.py:65
 msgid "Selected category is invalid."
-msgstr "选定的版块无效。"
+msgstr "选版块无效。"
 
 #: threads/api/postingendpoint/category.py:71
 msgid ""
 "Selected category doesn't exist or you don't have permission to browse it."
-msgstr "选定的版块不存在或你没有浏览权限。"
+msgstr "选版块不存在或你没有浏览权限。"
 
 #: threads/api/postingendpoint/emailnotification.py:43
 #, python-format
 msgid "%(user)s has replied to your thread \"%(thread)s\""
-msgstr "%(user)s 回复了你的话题 “%(thread)s”"
+msgstr "%(user)s回复了你的话题\"%(thread)s\""
 
 #: threads/api/postingendpoint/emailnotification.py:46
 #, python-format
 msgid "%(user)s has replied to thread \"%(thread)s\" that you are watching"
-msgstr "%(user)s 已经回复了你关注的话题 “%(thread)s”"
+msgstr "%(user)s已经回复了你订阅的话题\"%(thread)s\""
 
 #: threads/api/postingendpoint/floodprotection.py:25
 msgid "You can't post message so quickly after previous one."
-msgstr "你不能如此频繁的发帖。"
+msgstr "你发帖过快,请稍后再试。"
 
 #: threads/api/postingendpoint/floodprotection.py:35
 msgid "Your account has exceed an hourly post limit."
@@ -4666,7 +4745,7 @@ msgstr "你今日发布的帖子数量已达每日限制数。"
 #: threads/api/postingendpoint/participants.py:52
 msgid ""
 "You can't include yourself on the list of users to invite to new thread."
-msgstr "你在新话题中邀请自己。"
+msgstr "你不能在新话题中邀请自己。"
 
 #: threads/api/postingendpoint/participants.py:61
 msgid "You have to enter user names."
@@ -4689,7 +4768,7 @@ msgstr "无法找到一个或多个用户:%(usernames)s"
 
 #: threads/api/postingendpoint/reply.py:81 threads/validators.py:76
 msgid "You have to enter a message."
-msgstr "你必须输入消息。"
+msgstr "你必须输入内容。"
 
 #: threads/api/postingendpoint/reply.py:106
 msgid "You have to enter thread title."
@@ -4710,11 +4789,11 @@ msgstr "不是有效的字符串。"
 
 #: threads/api/threadendpoints/patch.py:86
 msgid "You can't change globally pinned threads weights in this category."
-msgstr "你不能编辑该类别全局置顶帖的权重。"
+msgstr "你不能编辑该版块中全局置顶帖的话题。"
 
 #: threads/api/threadendpoints/patch.py:94
 msgid "You can't pin threads globally in this category."
-msgstr "你无法全局置顶该类别的帖子。"
+msgstr "你无法全局置顶该版块中的帖子。"
 
 #: threads/api/threadendpoints/patch.py:122
 msgid "You can't move thread to the category it's already in."
@@ -4726,14 +4805,14 @@ msgstr "你没有关闭此话题的权限。"
 
 #: threads/api/threadendpoints/patch.py:172
 msgid "You don't have permission to open this thread."
-msgstr "你没有权限打开此话题。"
+msgstr "你没有打开此话题的权限。"
 
 #: threads/api/threadendpoints/patch.py:225
 #: threads/api/threadendpoints/patch.py:264
 #: threads/api/threadendpoints/patch.py:327
 #: threads/api/threadendpoints/patch.py:355
 msgid "A valid integer is required."
-msgstr "需要一个有效的整数。"
+msgstr "必须填一个有效整数。"
 
 #: threads/api/threadendpoints/patch.py:238
 msgid "This post is already marked as thread's best answer."
@@ -4743,7 +4822,7 @@ msgstr "这篇帖子已被标记为该话题的最佳答案。"
 msgid ""
 "This post can't be unmarked because it's not currently marked as best "
 "answer."
-msgstr "这篇文章不能被取消标记,因为它目前没有被标记为最佳答案。"
+msgstr "此帖子无法取消标记,因为它目前未被标记为最佳答案。"
 
 #: threads/api/threadendpoints/patch.py:301
 msgid "You have to enter new participant's username."
@@ -4751,7 +4830,7 @@ msgstr "你必须输入新参与者的用户名。"
 
 #: threads/api/threadendpoints/patch.py:304
 msgid "No user with such name exists."
-msgstr "不存在具有此类名称的用户。"
+msgstr "用户名不存在。"
 
 #: threads/api/threadendpoints/patch.py:307
 msgid "This user is already thread participant."
@@ -4798,7 +4877,7 @@ msgstr "你不能发起隐蔽话题。"
 
 #: threads/mergeconflict.py:56
 msgid "Unmark all best answers"
-msgstr "取消标记所有最佳答案"
+msgstr "取消所有最佳答案标记"
 
 #: threads/mergeconflict.py:75
 msgid "Delete all polls"
@@ -4836,20 +4915,20 @@ msgstr "全局置顶话题"
 
 #: threads/moderation/posts.py:53
 msgid "You can't make original post visible without revealing thread."
-msgstr "你不能使原始的帖子可见,而不显示话题。"
+msgstr "你不能使帖子可见,而不显示话题。"
 
 #: threads/moderation/posts.py:66
 msgid "You can't hide original post without hiding thread."
-msgstr "你不能隐藏原始帖子而不隐藏话题。"
+msgstr "你不能隐藏帖子而不隐藏话题。"
 
 #: threads/moderation/posts.py:92
 msgid "You can't delete original post without deleting thread."
-msgstr "你不能删除原始帖子而不删除话题。"
+msgstr "你不能删除帖子而不删除话题。"
 
 #: threads/participants.py:142
 #, python-format
 msgid "%(user)s has invited you to participate in private thread \"%(thread)s\""
-msgstr "%(user)s 邀请你参与隐蔽话题 “%(thread)s”"
+msgstr "%(user)s邀请你参与隐蔽话题 \"%(thread)s\""
 
 #: threads/permissions/attachments.py:14
 msgid "Max attached file size (in kb)"
@@ -4857,19 +4936,19 @@ msgstr "最大附件文件大小(以KB为单位)"
 
 #: threads/permissions/attachments.py:15
 msgid "Enter 0 to don't allow uploading end deleting attachments."
-msgstr "输入0不允许上传和删除附件。"
+msgstr "输入0不允许上传和删除附件。"
 
 #: threads/permissions/attachments.py:21
 msgid "Can download other users attachments"
-msgstr "可下载其他用户的附件"
+msgstr "可下载其他用户的附件"
 
 #: threads/permissions/attachments.py:24
 msgid "Can delete other users attachments"
-msgstr "可删除其他用户的附件"
+msgstr "可删除其他用户的附件"
 
 #: threads/permissions/attachments.py:32
 msgid "Can download attachments"
-msgstr "可下载附件"
+msgstr "可下载附件"
 
 #: threads/permissions/bestanswers.py:28
 msgid "Best answers"
@@ -4877,7 +4956,7 @@ msgstr "最佳答案"
 
 #: threads/permissions/bestanswers.py:31
 msgid "Can mark posts as best answers"
-msgstr "可以将帖子标记为最佳答案"
+msgstr "可标记帖子为最佳答案"
 
 #: threads/permissions/bestanswers.py:34 threads/permissions/bestanswers.py:40
 #: threads/permissions/polls.py:34 threads/permissions/threads.py:120
@@ -4892,7 +4971,7 @@ msgstr "所有话题"
 
 #: threads/permissions/bestanswers.py:37
 msgid "Can change marked answers"
-msgstr "可以更改标记的答案"
+msgstr "可修改最佳答案标记"
 
 #: threads/permissions/bestanswers.py:44
 msgid "Time limit for changing marked best answer in owned thread, in minutes"
@@ -4901,12 +4980,12 @@ msgstr "在发起的话题中可修改已标记最佳答案的时间,以分钟
 #: threads/permissions/bestanswers.py:47
 msgid ""
 "Enter 0 to don't limit time for changing marked best answer in owned thread."
-msgstr "输入0可随意修改发起话题中的最佳答案。"
+msgstr "输入0可随意修改自己话题中的最佳答案。"
 
 #: threads/permissions/bestanswers.py:134
 #: threads/permissions/bestanswers.py:293
 msgid "You have to sign in to mark best answers."
-msgstr "请登录,然后才能标记最佳答案。"
+msgstr "你必须登录才能标记最佳答案。"
 
 #: threads/permissions/bestanswers.py:141
 #: threads/permissions/bestanswers.py:303
@@ -4928,20 +5007,20 @@ msgstr "你只能在你发起的话题中标记最佳答案。"
 msgid ""
 "You don't have permission to mark best answer in this thread because its "
 "category \"%(category)s\" is closed."
-msgstr "你无法在此话题中标记最佳答案,因为所属版块 “%(category)s” 已关闭。"
+msgstr "你无法在此话题中标记最佳答案,因为所属版块 \"%(category)s\" 已关闭。"
 
 #: threads/permissions/bestanswers.py:170
 msgid ""
 "You can't mark best answer in this thread because it's closed and you don't "
 "have permission to open it."
-msgstr "你不可以在此话题中标记最佳答案,因为此话题已关闭且你不能重新开启该话题。"
+msgstr "你无法在此话题中标记最佳答案,因为此话题已关闭且你无法重新开启话题。"
 
 #: threads/permissions/bestanswers.py:188
 #, python-format
 msgid ""
 "You don't have permission to change this thread's marked answer because it's"
 " in the \"%(category)s\" category."
-msgstr "你无法修改此话题的最佳答案,因为该话题发表在 “%(category)s” 版块中。"
+msgstr "你无法修改此话题标记的最佳答案,因为 \"%(category)s\" 版块不允许执行此操作。"
 
 #: threads/permissions/bestanswers.py:198
 msgid ""
@@ -4974,7 +5053,7 @@ msgstr "你必须登录才能取消标记最佳答案。"
 msgid ""
 "You don't have permission to unmark threads answers in the \"%(category)s\" "
 "category."
-msgstr "你无法取消标记 “%(category)s” 版块中话题的答案。"
+msgstr "你无法取消标记 \"%(category)s\" 版块中话题的答案。"
 
 #: threads/permissions/bestanswers.py:247
 msgid ""
@@ -4997,7 +5076,7 @@ msgstr[0] "你不可以取消已标记最佳答案超过 %(minutes)s 分钟的
 msgid ""
 "You don't have permission to unmark this best answer because its category "
 "\"%(category)s\" is closed."
-msgstr "你无法取消标记最佳答案,因为 “%(category)s” 版块已关闭。"
+msgstr "你无法取消标记最佳答案,因为 \"%(category)s\" 版块已关闭。"
 
 #: threads/permissions/bestanswers.py:274
 msgid ""
@@ -5017,7 +5096,7 @@ msgstr "事件不能标记为最佳答案。"
 
 #: threads/permissions/bestanswers.py:322
 msgid "First post in a thread can't be marked as best answer."
-msgstr "话题中的第一帖子不能标记为最佳答案。"
+msgstr "话题中的第一帖子不能标记为最佳答案。"
 
 #: threads/permissions/bestanswers.py:326
 msgid "Hidden posts can't be marked as best answers."
@@ -5025,7 +5104,7 @@ msgstr "已隐藏的帖子不能被标记为最佳答案。"
 
 #: threads/permissions/bestanswers.py:329
 msgid "Unapproved posts can't be marked as best answers."
-msgstr "未通过审的帖子不能被标记为最佳答案。"
+msgstr "未通过审的帖子不能被标记为最佳答案。"
 
 #: threads/permissions/bestanswers.py:334
 msgid ""
@@ -5035,11 +5114,11 @@ msgstr "你无法标记此帖子为最佳答案,因为版主已锁定该话题
 
 #: threads/permissions/bestanswers.py:346
 msgid "You can't hide this post because its marked as best answer."
-msgstr "你不能隐藏此帖子因为它已标记为最佳答案。"
+msgstr "你不能隐藏此帖子, 因为它已标记为最佳答案。"
 
 #: threads/permissions/bestanswers.py:356
 msgid "You can't delete this post because its marked as best answer."
-msgstr "你不能删除此帖子因为它已标记为最佳答案。"
+msgstr "你不能删除此帖子, 因为它已标记为最佳答案。"
 
 #: threads/permissions/polls.py:28
 msgid "Polls"
@@ -5067,15 +5146,15 @@ msgstr "可删除投票"
 
 #: threads/permissions/polls.py:49
 msgid "Time limit for own polls edits, in minutes"
-msgstr "可修改自己投票的时间限制(分钟)"
+msgstr "可修改自己投票的时间限制(分钟)"
 
 #: threads/permissions/polls.py:50
 msgid "Enter 0 to don't limit time for editing own polls."
-msgstr "输入0不限制修改自己的投票的时间。"
+msgstr "输入0可随意修改投票。"
 
 #: threads/permissions/polls.py:55
 msgid "Can always see polls voters"
-msgstr "总可以查看投票者"
+msgstr "可随时查看投票者"
 
 #: threads/permissions/polls.py:57
 msgid "Allows users to see who voted in poll even if poll votes are secret."
@@ -5117,15 +5196,15 @@ msgstr "你无法编辑此版块中其他用户的投票。"
 #, python-format
 msgid "You can't edit polls that are older than %(minutes)s minute."
 msgid_plural "You can't edit polls that are older than %(minutes)s minutes."
-msgstr[0] "你无法编辑发起投票时间超过 %(minutes)s 分钟的投票。"
+msgstr[0] "你无法编辑发起投票超过 %(minutes)s 分钟的投票。"
 
 #: threads/permissions/polls.py:162
 msgid "This poll is over. You can't edit it."
-msgstr "投票已结束,无法编辑。"
+msgstr "投票已结束,禁止编辑。"
 
 #: threads/permissions/polls.py:167
 msgid "This category is closed. You can't edit polls in it."
-msgstr "你不能编辑已关闭版块中的投票。"
+msgstr "你不能编辑已关闭版块中的投票。"
 
 #: threads/permissions/polls.py:171
 msgid "This thread is closed. You can't edit polls in it."
@@ -5175,11 +5254,11 @@ msgstr "投票已结束,你不能投票。"
 
 #: threads/permissions/polls.py:233
 msgid "This category is closed. You can't vote in it."
-msgstr "此版块已关闭。你不能投票。"
+msgstr "你不能在已关闭的版块中投票 。"
 
 #: threads/permissions/polls.py:235
 msgid "This thread is closed. You can't vote in it."
-msgstr "此话题已关闭。你不能投票。"
+msgstr "你不能在已关闭的话题中投票。"
 
 #: threads/permissions/polls.py:243
 msgid "You dont have permission to this poll's voters."
@@ -5187,15 +5266,15 @@ msgstr "你不能查看该投票的参与者。"
 
 #: threads/permissions/privatethreads.py:35
 msgid "Can use private threads"
-msgstr "可使用隐蔽话题"
+msgstr "可使用隐蔽话题"
 
 #: threads/permissions/privatethreads.py:36
 msgid "Can start private threads"
-msgstr "可发起隐蔽话题"
+msgstr "可发起隐蔽话题"
 
 #: threads/permissions/privatethreads.py:38
 msgid "Max number of users invited to private thread"
-msgstr "可邀请用户到隐蔽话题的最大数"
+msgstr "可邀请到隐蔽话题的最大用户数"
 
 #: threads/permissions/privatethreads.py:39
 msgid "Enter 0 to don't limit number of participants."
@@ -5203,15 +5282,15 @@ msgstr "输入0不限制参与人数。"
 
 #: threads/permissions/privatethreads.py:44
 msgid "Can add everyone to threads"
-msgstr "可以将任何人添加到话题中"
+msgstr "可将任意用户添加到话题中"
 
 #: threads/permissions/privatethreads.py:46
-msgid "Allows user to add users that are blocking him to private threads."
-msgstr "允许用户将拉黑他的用户添加到专用话题。"
+msgid "Allows user to add users that are blocking them to private threads."
+msgstr ""
 
 #: threads/permissions/privatethreads.py:50
 msgid "Can report private threads"
-msgstr "可举报隐蔽话题"
+msgstr "可举报隐蔽话题"
 
 #: threads/permissions/privatethreads.py:52
 msgid ""
@@ -5221,7 +5300,7 @@ msgstr "允许用户举报他们正在参与的隐蔽话题,使其能够被版
 
 #: threads/permissions/privatethreads.py:57
 msgid "Can moderate private threads"
-msgstr "可以审查隐蔽话题"
+msgstr "可调整隐蔽话题"
 
 #: threads/permissions/privatethreads.py:59
 msgid ""
@@ -5239,7 +5318,7 @@ msgstr "你不能使用隐蔽话题。"
 
 #: threads/permissions/privatethreads.py:210
 msgid "Only thread owner and moderators can change threads owners."
-msgstr "只有话题所有人和版主可以修改话题所有人。"
+msgstr "只有话题所有者和版主可修改话题所有者。"
 
 #: threads/permissions/privatethreads.py:214
 msgid "Only moderators can change closed threads owners."
@@ -5255,15 +5334,15 @@ msgstr "只有版主可以向已关闭话题中添加参与者。"
 
 #: threads/permissions/privatethreads.py:238
 msgid "You can't add any more new users to this thread."
-msgstr "你不能再向此话题中添加任何新用户。"
+msgstr "你不能添加更多用户到此话题中。"
 
 #: threads/permissions/privatethreads.py:253
 msgid "Only moderators can remove participants from closed threads."
-msgstr "只有版主可以从关闭的话题中删除参与者。"
+msgstr "仅版主可从已关闭的话题中移除参与者。"
 
 #: threads/permissions/privatethreads.py:258
 msgid "You have to be thread owner to remove participants from it."
-msgstr "你必须是话题所有者才能从中删除参与者。"
+msgstr "你必须是话题所有者才能除参与者。"
 
 #: threads/permissions/privatethreads.py:270
 #, python-format
@@ -5287,7 +5366,7 @@ msgstr "%(user)s 仅接受关注用户的隐蔽话题邀请。"
 
 #: threads/permissions/threads.py:76
 msgid "Can see unapproved content list"
-msgstr "可以看到未审批的内容列表"
+msgstr "可查看未审批的内容列表"
 
 #: threads/permissions/threads.py:78
 msgid ""
@@ -5301,7 +5380,7 @@ msgstr ""
 
 #: threads/permissions/threads.py:87
 msgid "Can see reported content list"
-msgstr "可以看到举报的内容列表"
+msgstr "可查看被举报的内容列表"
 
 #: threads/permissions/threads.py:89
 msgid ""
@@ -5319,19 +5398,19 @@ msgstr "可无限发布"
 
 #: threads/permissions/threads.py:99
 msgid "Allows posting more frequently than flood protection would."
-msgstr "允许比洪水攻击保护更频繁的发帖。"
+msgstr "允许用户越过发帖保护进行发帖。"
 
 #: threads/permissions/threads.py:107
 msgid "Can see threads"
-msgstr "可以看到话题"
+msgstr "可查看话题"
 
 #: threads/permissions/threads.py:113
 msgid "Can start threads"
-msgstr "可发起话题"
+msgstr "可发起话题"
 
 #: threads/permissions/threads.py:114
 msgid "Can reply to threads"
-msgstr "可回复话题"
+msgstr "可回复话题"
 
 #: threads/permissions/threads.py:117
 msgid "Can edit threads"
@@ -5339,7 +5418,7 @@ msgstr "可编辑话题"
 
 #: threads/permissions/threads.py:123
 msgid "Can hide own threads"
-msgstr "可隐藏自己的话题"
+msgstr "可隐藏自己的话题"
 
 #: threads/permissions/threads.py:125
 msgid ""
@@ -5356,43 +5435,43 @@ msgstr "删除话题"
 
 #: threads/permissions/threads.py:133
 msgid "Time limit for own threads edits, in minutes"
-msgstr "自己发起的话题编辑时间限制(单位:分钟)"
+msgstr "自己发起的话题编辑时间限制,以分钟为单位"
 
 #: threads/permissions/threads.py:134
 msgid "Enter 0 to don't limit time for editing own threads."
-msgstr "输入0不限制编辑自己发起的话题的时间。"
+msgstr "输入0可随时修改自己发起的话题。"
 
 #: threads/permissions/threads.py:139
 msgid "Can hide all threads"
-msgstr "可隐藏所有话题"
+msgstr "可隐藏所有话题"
 
 #: threads/permissions/threads.py:146
 msgid "Can pin threads"
-msgstr "可置顶话题"
+msgstr "可置顶话题"
 
 #: threads/permissions/threads.py:149
 msgid "Locally"
-msgstr "在所属版块"
+msgstr "版块"
 
 #: threads/permissions/threads.py:149
 msgid "Globally"
-msgstr "在全球范围内"
+msgstr "全局"
 
 #: threads/permissions/threads.py:151
 msgid "Can close threads"
-msgstr "可关闭话题"
+msgstr "可关闭话题"
 
 #: threads/permissions/threads.py:152
 msgid "Can move threads"
-msgstr "可移动话题"
+msgstr "可移动话题"
 
 #: threads/permissions/threads.py:153
 msgid "Can merge threads"
-msgstr "可合并话题"
+msgstr "可合并话题"
 
 #: threads/permissions/threads.py:156
 msgid "Can edit posts"
-msgstr "可编辑帖子"
+msgstr "可编辑帖子"
 
 #: threads/permissions/threads.py:159
 msgid "Own posts"
@@ -5404,11 +5483,11 @@ msgstr "所有帖子"
 
 #: threads/permissions/threads.py:162
 msgid "Can hide own posts"
-msgstr "可隐藏自己的帖子"
+msgstr "可隐藏自己的帖子"
 
 #: threads/permissions/threads.py:164
 msgid "Only last posts to thread made within edit time limit can be hidden."
-msgstr "只能在编辑时间限制内话题最后的帖子才能被隐藏。"
+msgstr "仅可以隐藏在可编辑时间范围内的帖子。"
 
 #: threads/permissions/threads.py:168 threads/permissions/threads.py:180
 msgid "Hide posts"
@@ -5420,59 +5499,59 @@ msgstr "删除帖子"
 
 #: threads/permissions/threads.py:171
 msgid "Time limit for own post edits, in minutes"
-msgstr "自己帖子的编辑时,以分钟为单位"
+msgstr "自己帖子的编辑时限,以分钟为单位"
 
 #: threads/permissions/threads.py:172
 msgid "Enter 0 to don't limit time for editing own posts."
-msgstr "输入0不限制编辑自己的帖子的时间。"
+msgstr "输入0可无限编辑帖子。"
 
 #: threads/permissions/threads.py:177
 msgid "Can hide all posts"
-msgstr "可隐藏所有帖子"
+msgstr "可隐藏所有帖子"
 
 #: threads/permissions/threads.py:184
 msgid "Can see posts likes"
-msgstr "可以看到帖子的赞"
+msgstr "可查看帖子的赞"
 
 #: threads/permissions/threads.py:189
 msgid "Number only"
-msgstr "数"
+msgstr "仅点赞数"
 
 #: threads/permissions/threads.py:190
 msgid "Number and list of likers"
-msgstr "点赞数和名单"
+msgstr "点赞数和名单"
 
 #: threads/permissions/threads.py:194
 msgid "Can like posts"
-msgstr "可赞帖子"
+msgstr "可赞帖子"
 
 #: threads/permissions/threads.py:195
 msgid "Only users with this permission to see likes can like posts."
-msgstr "只有拥有此权限的用户才能看到赞的帖子。"
+msgstr "仅拥有可查看点赞权限的用户才能点赞。"
 
 #: threads/permissions/threads.py:199
 msgid "Can protect posts"
-msgstr "可以保护帖子"
+msgstr "可锁定帖子"
 
 #: threads/permissions/threads.py:200
 msgid "Only users with this permission can edit protected posts."
-msgstr "只有具有此权限的用户才能编被辑保护的帖子。"
+msgstr "仅拥有可锁定帖子权限的用户才能编辑锁定的帖子。"
 
 #: threads/permissions/threads.py:203
 msgid "Can move posts"
-msgstr "可移动帖子"
+msgstr "可移动帖子"
 
 #: threads/permissions/threads.py:204
 msgid "Will be able to move posts to other threads."
-msgstr "将能够将帖子移动到其他话题。"
+msgstr "将可以将帖子移动到其他话题中。"
 
 #: threads/permissions/threads.py:206
 msgid "Can merge posts"
-msgstr "可合并帖子"
+msgstr "可合并帖子"
 
 #: threads/permissions/threads.py:208
 msgid "Can approve content"
-msgstr "可审批内容"
+msgstr "可审批内容"
 
 #: threads/permissions/threads.py:209
 msgid "Will be able to see and approve unapproved content."
@@ -5480,15 +5559,15 @@ msgstr "将能够查看和审批未审批的内容。"
 
 #: threads/permissions/threads.py:211
 msgid "Can report posts"
-msgstr "可举报帖子"
+msgstr "可举报帖子"
 
 #: threads/permissions/threads.py:212
 msgid "Can see reports"
-msgstr "可查看举报"
+msgstr "可查看举报"
 
 #: threads/permissions/threads.py:215
 msgid "Can hide events"
-msgstr "可隐藏事件"
+msgstr "可隐藏事件"
 
 #: threads/permissions/threads.py:218
 msgid "Hide events"
@@ -5504,11 +5583,11 @@ msgstr "话题需要审批"
 
 #: threads/permissions/threads.py:222
 msgid "Require replies approval"
-msgstr "回需要审批"
+msgstr "回需要审批"
 
 #: threads/permissions/threads.py:223
 msgid "Require edits approval"
-msgstr "编辑内容需要审批"
+msgstr "编辑需要审批"
 
 #: threads/permissions/threads.py:539
 msgid "You have to sign in to start threads."
@@ -5516,27 +5595,27 @@ msgstr "你必须登录才能发起话题。"
 
 #: threads/permissions/threads.py:545
 msgid "You don't have permission to start new threads in this category."
-msgstr "你没有在此版块中发起新话题的权限。"
+msgstr "你不能在此版块中发起新话题。"
 
 #: threads/permissions/threads.py:550
 msgid "This category is closed. You can't start new threads in it."
-msgstr "此版块已关闭。你不能在其中发起新话题。"
+msgstr "你不能在已关闭的版块中发起新话题。"
 
 #: threads/permissions/threads.py:559
 msgid "You have to sign in to reply threads."
-msgstr "登录后才能回帖。"
+msgstr "你需要登录后才能回复话题。"
 
 #: threads/permissions/threads.py:566
 msgid "You can't reply to threads in this category."
-msgstr "你不能在此版块中的话题下回帖。"
+msgstr "你不能回复此版块中的话题。"
 
 #: threads/permissions/threads.py:571
 msgid "This category is closed. You can't reply to threads in it."
-msgstr "此版块已关闭。你不能在此回帖。"
+msgstr "你不能回复已关闭的版块中的话题。"
 
 #: threads/permissions/threads.py:575
 msgid "You can't reply to closed threads in this category."
-msgstr "你不能回复此版块中关闭的话题。"
+msgstr "你不能回复此版块中已关闭的话题。"
 
 #: threads/permissions/threads.py:584
 msgid "You have to sign in to edit threads."
@@ -5548,17 +5627,17 @@ msgstr "你不能编辑此版块中的话题。"
 
 #: threads/permissions/threads.py:596
 msgid "You can't edit other users threads in this category."
-msgstr "你无法编辑此版块中其他用户话题。"
+msgstr "你无法编辑此版块中其他用户话题。"
 
 #: threads/permissions/threads.py:601
 #, python-format
 msgid "You can't edit threads that are older than %(minutes)s minute."
 msgid_plural "You can't edit threads that are older than %(minutes)s minutes."
-msgstr[0] "你不能编辑早于 %(minutes)s 的话题。"
+msgstr[0] "你不能编辑已发布 %(minutes)s 的话题。"
 
 #: threads/permissions/threads.py:612
 msgid "This category is closed. You can't edit threads in it."
-msgstr "此版块已关闭。你不能编辑话题。"
+msgstr "你不能编辑已关闭版块中的话题。"
 
 #: threads/permissions/threads.py:615
 msgid "This thread is closed. You can't edit it."
@@ -5687,19 +5766,19 @@ msgstr "此话题已关闭,你不能将它和其它话题合并。"
 
 #: threads/permissions/threads.py:813
 msgid "You have to sign in to approve threads."
-msgstr "你必须登录才能审话题。"
+msgstr "你必须登录才能审话题。"
 
 #: threads/permissions/threads.py:820
 msgid "You can't approve threads in this category."
-msgstr "你不能审此版块中的话题。"
+msgstr "你不能审此版块中的话题。"
 
 #: threads/permissions/threads.py:825
 msgid "This category is closed. You can't approve threads in it."
-msgstr "你不能审已关闭版块中的帖子。"
+msgstr "你不能审已关闭版块中的帖子。"
 
 #: threads/permissions/threads.py:828
 msgid "This thread is closed. You can't approve it."
-msgstr "你不能审已关闭的话题。"
+msgstr "你不能审已关闭的话题。"
 
 #: threads/permissions/threads.py:858
 msgid "You have to sign in to edit posts."
@@ -5711,11 +5790,11 @@ msgstr "事件无法编辑。"
 
 #: threads/permissions/threads.py:868
 msgid "You can't edit posts in this category."
-msgstr "你无法编辑此版块中的帖子。"
+msgstr "你不能编辑此版块中的帖子。"
 
 #: threads/permissions/threads.py:875
 msgid "This post is hidden, you can't edit it."
-msgstr "此帖子是隐藏的,你不能编辑它。"
+msgstr "你不能编辑已隐藏的帖子。"
 
 #: threads/permissions/threads.py:880
 msgid "You can't edit other users posts in this category."
@@ -5723,55 +5802,55 @@ msgstr "你不能编辑此版块中的其他用户的帖子。"
 
 #: threads/permissions/threads.py:884
 msgid "This post is protected. You can't edit it."
-msgstr "此帖被保护。你不能编辑它。"
+msgstr "你不能编辑已锁定的帖子。"
 
 #: threads/permissions/threads.py:888
 #, python-format
 msgid "You can't edit posts that are older than %(minutes)s minute."
 msgid_plural "You can't edit posts that are older than %(minutes)s minutes."
-msgstr[0] "你不能编辑早于 %(minutes)s 分钟的帖子。"
+msgstr[0] "你不能编辑已发布超过 %(minutes)s 分钟的帖子。"
 
 #: threads/permissions/threads.py:899
 msgid "This category is closed. You can't edit posts in it."
-msgstr "此版块已关闭。你无法编辑其中的帖子。"
+msgstr "你不能编辑已关闭版块中的帖子。"
 
 #: threads/permissions/threads.py:903
 msgid "This thread is closed. You can't edit posts in it."
-msgstr "此话题已关闭。你无法编辑其中的帖子。"
+msgstr "你不能编辑已关闭话题中的帖子。"
 
 #: threads/permissions/threads.py:912
 msgid "You have to sign in to reveal posts."
-msgstr "你必须登录才能显示帖子。"
+msgstr "你必须登录才能重新显示帖子。"
 
 #: threads/permissions/threads.py:920
 msgid "You can't reveal posts in this category."
-msgstr "你不能显示此版块中的帖子。"
+msgstr "你不能重新显示此版块中的帖子。"
 
 #: threads/permissions/threads.py:924
 msgid "You can't reveal other users posts in this category."
-msgstr "你不能显示此版块中其他用户的帖子。"
+msgstr "你不能重新显示此版块中其他用户的帖子。"
 
 #: threads/permissions/threads.py:928
 msgid "This post is protected. You can't reveal it."
-msgstr "此帖被保护。你不能显示它。"
+msgstr "你不能重新显示已锁定的帖子。"
 
 #: threads/permissions/threads.py:932
 #, python-format
 msgid "You can't reveal posts that are older than %(minutes)s minute."
 msgid_plural "You can't reveal posts that are older than %(minutes)s minutes."
-msgstr[0] "你不能重新显示超过 %(minutes)s 分钟的帖子。"
+msgstr[0] "你不能重新显示已发布超过 %(minutes)s 分钟的帖子。"
 
 #: threads/permissions/threads.py:941
 msgid "You can't reveal thread's first post."
-msgstr "你不能显示话题的第一篇文章。"
+msgstr "你不能重新显示话题的第一条帖子。"
 
 #: threads/permissions/threads.py:946
 msgid "This category is closed. You can't reveal posts in it."
-msgstr "此版块已关闭。你不能显示其中的帖子。"
+msgstr "你不能重新显示已关闭版块中的帖子。"
 
 #: threads/permissions/threads.py:950
 msgid "This thread is closed. You can't reveal posts in it."
-msgstr "此话题已关闭。你不能显示其中的帖子。"
+msgstr "你不能重新显示已关闭话题中的帖子。"
 
 #: threads/permissions/threads.py:959
 msgid "You have to sign in to hide posts."
@@ -5779,33 +5858,33 @@ msgstr "你必须登录才能隐藏帖子。"
 
 #: threads/permissions/threads.py:967
 msgid "You can't hide posts in this category."
-msgstr "你无法隐藏此版块中的帖子。"
+msgstr "你不能隐藏此版块中的帖子。"
 
 #: threads/permissions/threads.py:971
 msgid "You can't hide other users posts in this category."
-msgstr "你不能隐藏此版块中其他用户的帖子。"
+msgstr "你不能隐藏此版块中其他用户的帖子。"
 
 #: threads/permissions/threads.py:975
 msgid "This post is protected. You can't hide it."
-msgstr "此帖被保护。你不能隐藏它。"
+msgstr "你不能隐藏已锁定的帖子。"
 
 #: threads/permissions/threads.py:979
 #, python-format
 msgid "You can't hide posts that are older than %(minutes)s minute."
 msgid_plural "You can't hide posts that are older than %(minutes)s minutes."
-msgstr[0] "你不能隐藏早于 %(minutes)s 分钟的帖子。"
+msgstr[0] "你不能隐藏已发布超过 %(minutes)s 分钟的帖子。"
 
 #: threads/permissions/threads.py:988
 msgid "You can't hide thread's first post."
-msgstr "你不能隐藏话题中的第一帖子。"
+msgstr "你不能隐藏话题中的第一帖子。"
 
 #: threads/permissions/threads.py:993
 msgid "This category is closed. You can't hide posts in it."
-msgstr "此版块已关闭。你不能隐藏其中的帖子。"
+msgstr "你不能隐藏已关闭版块中的帖子。"
 
 #: threads/permissions/threads.py:997
 msgid "This thread is closed. You can't hide posts in it."
-msgstr "此话题已关闭。你不能隐藏其中的帖子。"
+msgstr "你不能隐藏已关闭话题中的帖子。"
 
 #: threads/permissions/threads.py:1006
 msgid "You have to sign in to delete posts."
@@ -5817,41 +5896,41 @@ msgstr "你不能删除此版块中的帖子。"
 
 #: threads/permissions/threads.py:1018
 msgid "You can't delete other users posts in this category."
-msgstr "你不能删除此版块中其他用户的帖子。"
+msgstr "你不能删除此版块中其他用户的帖子。"
 
 #: threads/permissions/threads.py:1022
 msgid "This post is protected. You can't delete it."
-msgstr "此帖被保护。你不能删除它。"
+msgstr "你不能删除已锁定的帖子。"
 
 #: threads/permissions/threads.py:1026
 #, python-format
 msgid "You can't delete posts that are older than %(minutes)s minute."
 msgid_plural "You can't delete posts that are older than %(minutes)s minutes."
-msgstr[0] "你不能删除早于 %(minutes)s 分钟的帖子。"
+msgstr[0] "你不能删除已发布超过 %(minutes)s 分钟的帖子。"
 
 #: threads/permissions/threads.py:1035
 msgid "You can't delete thread's first post."
-msgstr "你不能删除话题的第一篇文章。"
+msgstr "你不能删除话题的第一篇帖子。"
 
 #: threads/permissions/threads.py:1040
 msgid "This category is closed. You can't delete posts in it."
-msgstr "此版块已关闭。你不能删除其中的帖子。"
+msgstr "你不能删除已关闭版块中的帖子。"
 
 #: threads/permissions/threads.py:1044
 msgid "This thread is closed. You can't delete posts in it."
-msgstr "此话题已关闭。你不能删除其中的帖子。"
+msgstr "你不能删除已关闭话题中的帖子。"
 
 #: threads/permissions/threads.py:1053
 msgid "You have to sign in to protect posts."
-msgstr "你必须登录才能保护帖子。"
+msgstr "你必须登录才能锁定帖子。"
 
 #: threads/permissions/threads.py:1060
 msgid "You can't protect posts in this category."
-msgstr "你无法保护此版块中的帖子。"
+msgstr "你无法锁定此版块中的帖子。"
 
 #: threads/permissions/threads.py:1062
 msgid "You can't protect posts you can't edit."
-msgstr "你无法保护你无法编辑的帖子。"
+msgstr "你无法锁定你无法编辑的帖子。"
 
 #: threads/permissions/threads.py:1070
 msgid "You have to sign in to approve posts."
@@ -5863,7 +5942,7 @@ msgstr "你不能审批此版块中的帖子。"
 
 #: threads/permissions/threads.py:1079
 msgid "You can't approve thread's first post."
-msgstr "你不能审批话题的第一帖子。"
+msgstr "你不能审批话题的第一帖子。"
 
 #: threads/permissions/threads.py:1085
 msgid "You can't approve posts the content you can't see."
@@ -5871,11 +5950,11 @@ msgstr "你不能审批你看不到内容的帖子。"
 
 #: threads/permissions/threads.py:1090
 msgid "This category is closed. You can't approve posts in it."
-msgstr "你不能审已关闭版块中的帖子。"
+msgstr "你不能审已关闭版块中的帖子。"
 
 #: threads/permissions/threads.py:1094
 msgid "This thread is closed. You can't approve posts in it."
-msgstr "你不能审已关闭话题中的帖子。"
+msgstr "你不能审已关闭话题中的帖子。"
 
 #: threads/permissions/threads.py:1103
 msgid "You have to sign in to move posts."
@@ -5887,15 +5966,15 @@ msgstr "你无法移动此版块中的帖子。"
 
 #: threads/permissions/threads.py:1112
 msgid "Events can't be moved."
-msgstr "活动无法移动。"
+msgstr "事件无法移动。"
 
 #: threads/permissions/threads.py:1114
 msgid "You can't move thread's first post."
-msgstr "你不能移动话题的第一帖子。"
+msgstr "你不能移动话题的第一帖子。"
 
 #: threads/permissions/threads.py:1116
 msgid "You can't move posts the content you can't see."
-msgstr "你不能移动你看不到内容的帖子。"
+msgstr "你不能移动你看不到内容的帖子。"
 
 #: threads/permissions/threads.py:1121
 msgid "This category is closed. You can't move posts in it."
@@ -5911,7 +5990,7 @@ msgstr "你必须登录才能合并帖子。"
 
 #: threads/permissions/threads.py:1141
 msgid "You can't merge posts in this category."
-msgstr "你不能合并此版块中的帖子。"
+msgstr "你无法合并此版块中的帖子。"
 
 #: threads/permissions/threads.py:1143
 msgid "Events can't be merged."
@@ -5943,11 +6022,11 @@ msgstr "无法拆分事件。"
 
 #: threads/permissions/threads.py:1178
 msgid "You can't split thread's first post."
-msgstr "你不能拆分话题的第一帖子。"
+msgstr "你不能拆分话题的第一帖子。"
 
 #: threads/permissions/threads.py:1180
 msgid "You can't split posts the content you can't see."
-msgstr "你不能拆分你看不到内容。"
+msgstr "你不能拆分你看不到内容的帖子。"
 
 #: threads/permissions/threads.py:1185
 msgid "This category is closed. You can't split posts in it."
@@ -6007,36 +6086,36 @@ msgstr "你不能删除已关闭话题中的事件。"
 
 #: threads/serializers/moderation.py:49
 msgid "You have to specify at least one post to delete."
-msgstr "你必须至少指定一要删除的帖子。"
+msgstr "你必须至少指定一要删除的帖子。"
 
 #: threads/serializers/moderation.py:56 threads/serializers/moderation.py:111
 #: threads/serializers/moderation.py:205 threads/serializers/moderation.py:363
 msgid "One or more post ids received were invalid."
-msgstr "接收的一个或多个帖子 ID 无效。"
+msgstr "收到的一条或多条帖子的 ID 无效。"
 
 #: threads/serializers/moderation.py:70
 #, python-format
 msgid "No more than %(limit)s post can be deleted at a single time."
 msgid_plural "No more than %(limit)s posts can be deleted at a single time."
-msgstr[0] "不能一次删除超过 %(limit)s 个帖子。"
+msgstr[0] "一次最多可以删除 %(limit)s 条帖子。"
 
 #: threads/serializers/moderation.py:98
 msgid "One or more posts to delete could not be found."
-msgstr "无法找到要删除的一个或多个帖子。"
+msgstr "无法找到一个或多个要删除的帖子。"
 
 #: threads/serializers/moderation.py:105
 msgid "You have to select at least two posts to merge."
-msgstr "至少两个帖子才能合并。"
+msgstr "至少选择两条帖子才能合并。"
 
 #: threads/serializers/moderation.py:128
 #, python-format
 msgid "No more than %(limit)s post can be merged at a single time."
 msgid_plural "No more than %(limit)s posts can be merged at a single time."
-msgstr[0] "一次最多可以合并 %(limit)s 帖子。"
+msgstr[0] "一次最多可以合并 %(limit)s 帖子。"
 
 #: threads/serializers/moderation.py:156
 msgid "Posts made by different users can't be merged."
-msgstr "无法合并不同用户发布的帖子。"
+msgstr "不同用户发布的帖子无法合并。"
 
 #: threads/serializers/moderation.py:169
 msgid "Post marked as best answer can't be merged with thread's first post."
@@ -6044,15 +6123,15 @@ msgstr "标记为最佳答案的帖子不能与话题的第一篇帖子合并。
 
 #: threads/serializers/moderation.py:180
 msgid "Posts with different visibility can't be merged."
-msgstr "无法合并具有不同可见性的帖子。"
+msgstr "具有不同可见性的帖子无法合并。"
 
 #: threads/serializers/moderation.py:187
 msgid "One or more posts to merge could not be found."
-msgstr "无法找到要合并的一个或多个帖子。"
+msgstr "找一条或多条要合并的帖子。"
 
 #: threads/serializers/moderation.py:195
 msgid "You have to specify at least one post to move."
-msgstr "至少指定一帖子才能移动。"
+msgstr "至少指定一帖子才能移动。"
 
 #: threads/serializers/moderation.py:199 threads/serializers/moderation.py:472
 msgid "Enter link to new thread."
@@ -6064,61 +6143,61 @@ msgstr "这不是一个有效的话题链接。"
 
 #: threads/serializers/moderation.py:225
 msgid "Thread to move posts to is same as current one."
-msgstr "帖子移动目的地与当前位置相同。"
+msgstr "帖子要移动到的话题与当前话题一致。"
 
 #: threads/serializers/moderation.py:233 threads/serializers/moderation.py:500
 msgid ""
 "The thread you have entered link to doesn't exist or you don't have "
 "permission to see it."
-msgstr "你输入的话题链接不存在或你没有浏览它的权限。"
+msgstr "你输入的话题链接不存在或你无法浏览。"
 
 #: threads/serializers/moderation.py:240
 msgid "You can't move posts to threads you can't reply."
-msgstr "你不能将帖子移动到你无法回的话题中。"
+msgstr "你不能将帖子移动到你无法回的话题中。"
 
 #: threads/serializers/moderation.py:250
 #, python-format
 msgid "No more than %(limit)s post can be moved at a single time."
 msgid_plural "No more than %(limit)s posts can be moved at a single time."
-msgstr[0] "一次最多可以移动 %(limit)s 帖子。"
+msgstr[0] "一次最多可以移动 %(limit)s 帖子。"
 
 #: threads/serializers/moderation.py:277
 msgid "One or more posts to move could not be found."
-msgstr "无法找到要移动的一个或多个帖子。"
+msgstr "找一条或多条将要移动的帖子。"
 
 #: threads/serializers/moderation.py:305
 msgid "You can't create new threads in selected category."
-msgstr "你不能在选定的版块中创建新话题。"
+msgstr "你不能在所选版块中发起新话题。"
 
 #: threads/serializers/moderation.py:319
 msgid "You don't have permission to pin threads globally in this category."
-msgstr "你没有权限在此版块中将话题全局置顶。"
+msgstr "你无法在此版块中将话题全局置顶。"
 
 #: threads/serializers/moderation.py:325
 msgid "You don't have permission to pin threads in this category."
-msgstr "你没有权限在此版块内置顶话题。"
+msgstr "你无法在此版块中置顶话题。"
 
 #: threads/serializers/moderation.py:337
 msgid "You don't have permission to hide threads in this category."
-msgstr "你没有在此版块中隐藏话题的权限。"
+msgstr "你无法在此版块中隐藏话题。"
 
 #: threads/serializers/moderation.py:349
 msgid "You don't have permission to close threads in this category."
-msgstr "你没有权限关闭此版块中的话题。"
+msgstr "你无法关闭此版块中的话题。"
 
 #: threads/serializers/moderation.py:356
 msgid "You have to specify at least one post to split."
-msgstr "至少指定一条要分的帖子。"
+msgstr "至少指定一条要分的帖子。"
 
 #: threads/serializers/moderation.py:377
 #, python-format
 msgid "No more than %(limit)s post can be split at a single time."
 msgid_plural "No more than %(limit)s posts can be split at a single time."
-msgstr[0] "一次最多可以拆分 %(limit)s 帖子。"
+msgstr[0] "一次最多可以拆分 %(limit)s 帖子。"
 
 #: threads/serializers/moderation.py:404
 msgid "One or more posts to split could not be found."
-msgstr "无法找到要拆分的一个或多个帖子。"
+msgstr "无法找到一条或多条将要拆分的帖子。"
 
 #: threads/serializers/moderation.py:411
 msgid "You have to specify at least one thread to delete."
@@ -6126,7 +6205,7 @@ msgstr "你必须至少指定一个要删除的话题。"
 
 #: threads/serializers/moderation.py:418 threads/serializers/moderation.py:534
 msgid "One or more thread ids received were invalid."
-msgstr "收的一个或多个话题 ID 无效。"
+msgstr "收的一个或多个话题 ID 无效。"
 
 #: threads/serializers/moderation.py:432
 #, python-format
@@ -6144,7 +6223,7 @@ msgstr "你不能将话题与自身合并。"
 
 #: threads/serializers/moderation.py:507
 msgid "You can't merge this thread into thread you can't reply."
-msgstr "你无法将此话题合并到你无法回的话题中。"
+msgstr "你无法将此话题合并到你无法回的话题中。"
 
 #: threads/serializers/moderation.py:526
 msgid "You have to select at least two threads to merge."
@@ -6158,7 +6237,7 @@ msgstr[0] "一次最多可以合并 %(limit)s 个话题。"
 
 #: threads/serializers/moderation.py:578
 msgid "One or more threads to merge could not be found."
-msgstr "无法找到要合并的一个或多个话题。"
+msgstr "找到要合并的一个或多个话题。"
 
 #: threads/serializers/poll.py:106
 msgid "One or more poll choices are invalid."
@@ -6190,7 +6269,7 @@ msgstr[0] "此投票中每票最多选择 %(choices)s 个选项。"
 
 #: threads/serializers/pollvote.py:32
 msgid "One or more of poll choices were invalid."
-msgstr "一个或多个投票选项无效。"
+msgstr "一条或多条投票选项无效。"
 
 #: threads/serializers/pollvote.py:36
 msgid "You have to make a choice."
@@ -6239,7 +6318,7 @@ msgstr "你没有访问此版块的权限。"
 
 #: threads/validators.py:36
 msgid "Thread title should contain alpha-numeric characters."
-msgstr "话题名称应包含字母或数字字。"
+msgstr "话题名称应包含字。"
 
 #: threads/validators.py:37
 msgid "Thread title is too long."
@@ -6257,7 +6336,7 @@ msgid ""
 msgid_plural ""
 "Thread title should be at least %(limit_value)s characters long (it has "
 "%(show_value)s)."
-msgstr[0] "话题名称至少应该是 %(limit_value)s 字符长(现有 %(show_value)s 个字符)。"
+msgstr[0] "话题名称至少需要 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: threads/validators.py:62
 #, python-format
@@ -6267,7 +6346,7 @@ msgid ""
 msgid_plural ""
 "Thread title cannot be longer than %(limit_value)s characters (it has "
 "%(show_value)s)."
-msgstr[0] "话题名称不能超过 %(limit_value)s 字符(它有%(show_value)s)。"
+msgstr[0] "话题名称最多包含 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: threads/validators.py:81
 #, python-format
@@ -6277,7 +6356,7 @@ msgid ""
 msgid_plural ""
 "Posted message should be at least %(limit_value)s characters long (it has "
 "%(show_value)s)."
-msgstr[0] "发帖最少需要 %(limit_value)s 个字符(已有 %(show_value)s 个字符)。"
+msgstr[0] "发帖内容至少需要 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: threads/validators.py:92
 #, python-format
@@ -6287,7 +6366,7 @@ msgid ""
 msgid_plural ""
 "Posted message cannot be longer than %(limit_value)s characters (it has "
 "%(show_value)s)."
-msgstr[0] "发帖不能超过 %(limit_value)s 个字符(已有 %(show_value)s 个字符)。"
+msgstr[0] "发帖内容最多包含 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: threads/viewmodels/threads.py:23
 msgid "Your threads"
@@ -6319,7 +6398,7 @@ msgstr "你必须登录才能看到你尚未阅读的话题列表。"
 
 #: threads/viewmodels/threads.py:36
 msgid "You have to sign in to see list of threads with new replies."
-msgstr "登录才能看到有新回复的话题列表。"
+msgstr "你必须登录才能看到有新回复的话题列表。"
 
 #: threads/viewmodels/threads.py:39
 msgid "You have to sign in to see list of threads you are subscribing."
@@ -6327,11 +6406,11 @@ msgstr "你必须登录才能看到你订阅的话题列表。"
 
 #: threads/viewmodels/threads.py:42
 msgid "You have to sign in to see list of threads with unapproved posts."
-msgstr "你必须登录才能查看含有未审批帖子的话题列表。"
+msgstr "你必须登录才能看到未审批帖子的话题列表。"
 
 #: threads/viewmodels/threads.py:113
 msgid "You don't have permission to see unapproved content lists."
-msgstr "你没有权限查看未审批的内容列表。"
+msgstr "你无法查看未审批的内容列表。"
 
 #: threads/views/goto.py:130
 msgid ""
@@ -6345,11 +6424,11 @@ msgstr "封禁"
 
 #: users/admin/__init__.py:87
 msgid "Ranks"
-msgstr "级"
+msgstr "级"
 
 #: users/admin/djangoadmin.py:42
 msgid "Misago user data"
-msgstr "论坛框架用户数据"
+msgstr "Misago 用户数据"
 
 #: users/admin/djangoadmin.py:56
 msgid "Edit permissions and groups"
@@ -6357,7 +6436,7 @@ msgstr "编辑权限和组"
 
 #: users/admin/djangoadmin.py:76
 msgid "Edit the user from Misago admin panel"
-msgstr "从 Misago 管理面板编辑用户"
+msgstr "在 Misago 管理面版编辑用户"
 
 #: users/admin/forms.py:22 users/admin/forms.py:313 users/models/ban.py:71
 #: users/signals.py:29
@@ -6366,7 +6445,7 @@ msgstr "用户名"
 
 #: users/admin/forms.py:23
 msgid "Custom title"
-msgstr "自定义用户标题"
+msgstr "外号"
 
 #: users/admin/forms.py:24 users/models/ban.py:72
 msgid "E-mail address"
@@ -6399,7 +6478,7 @@ msgstr "只有管理员可以访问管理页面。另外,超级管理员可以
 
 #: users/admin/forms.py:91
 msgid "Is active"
-msgstr "激活状态"
+msgstr "激活"
 
 #: users/admin/forms.py:93
 msgid ""
@@ -6409,44 +6488,44 @@ msgstr "指定该用户是否应被视为激活状态。当需要删除用户账
 
 #: users/admin/forms.py:97 users/admin/forms.py:128 users/admin/forms.py:158
 msgid "Staff message"
-msgstr "员工可见消息"
+msgstr "员工消息"
 
 #: users/admin/forms.py:99
 msgid ""
 "Optional message for forum team members explaining why user's account has "
 "been disabled."
-msgstr "呈现给论坛管理团队的说明用户账号被封禁原因的消息。(可选)"
+msgstr "呈现给站点管理团队用于说明用户账号被封禁的原因。(可选)"
 
 #: users/admin/forms.py:104
 msgid "Change password to"
-msgstr "改密码"
+msgstr "改密码"
 
 #: users/admin/forms.py:111
 msgid "Lock avatar"
-msgstr "锁头像"
+msgstr "锁头像"
 
 #: users/admin/forms.py:113
 msgid ""
 "Setting this to yes will stop user from changing his/her avatar, and will "
 "reset his/her avatar to procedurally generated one."
-msgstr "设置为“是”将禁止用户更改他/她的头像,并将他/她的头像重置为程序生成的头像。"
+msgstr "设置为“是”将阻止用户修改其头像,并重置用户头像为程序生成头像。"
 
 #: users/admin/forms.py:119 users/admin/forms.py:150 users/admin/forms.py:457
 #: users/admin/forms.py:524
 msgid "User message"
-msgstr "用户可见消息"
+msgstr "用户息"
 
 #: users/admin/forms.py:121
 msgid ""
 "Optional message for user explaining why he/she is banned form changing "
 "avatar."
-msgstr "用于向用户说明他被禁止更改头像的原因的消息(可选)。"
+msgstr "用于向用户说明被禁止修改头像的原因(可选)。"
 
 #: users/admin/forms.py:130
 msgid ""
 "Optional message for forum team members explaining why user is banned form "
 "changing avatar."
-msgstr "呈现给论坛管理团队的用来说明用户被禁止更改头像的原因的消息(可选)。"
+msgstr "呈现给站点管理团队的用来说明用户被禁止修改头像的原因(可选)。"
 
 #: users/admin/forms.py:138
 msgid "Signature contents"
@@ -6459,20 +6538,20 @@ msgstr "锁定签名"
 #: users/admin/forms.py:145
 msgid ""
 "Setting this to yes will stop user from making changes to his/her signature."
-msgstr "设置为“是”将禁止用户更改签名。"
+msgstr "设置为“是”将阻止用户修改其签名。"
 
 #: users/admin/forms.py:152
 msgid "Optional message to user explaining why his/hers signature is locked."
-msgstr "用来向用户说明其签名被锁定原因的消息。(可选)"
+msgstr "用来向用户说明其签名被锁定原因。(可选)"
 
 #: users/admin/forms.py:160
 msgid ""
 "Optional message to team members explaining why user signature is locked."
-msgstr "呈现给论坛管理团队的说明用户签名被锁定原因的消息。(可选)"
+msgstr "呈现给站点管理团队,说明用户签名被锁定原因。(可选)"
 
 #: users/admin/forms.py:166
 msgid "Hides presence"
-msgstr "隐藏存在"
+msgstr "隐"
 
 #: users/admin/forms.py:169
 msgid "Who can add user to private threads"
@@ -6486,13 +6565,13 @@ msgstr "回复的话题"
 #, python-format
 msgid "Signature can't be longer than %(limit)s character."
 msgid_plural "Signature can't be longer than %(limit)s characters."
-msgstr[0] "签名不能超过 %(limit)s 字符。"
+msgstr[0] "签名不能超过 %(limit)s 字符。"
 
 #: users/admin/forms.py:240
 msgid ""
 "Ranks are used to group and distinguish users. They are also used to add "
 "permissions to groups of users."
-msgstr "等级用于分组和区分用户。它们也向用户组添加权限。"
+msgstr "级别用于分组和区分用户。同时也可向用户组添加权限。"
 
 #: users/admin/forms.py:252
 msgid "Individual roles of this user. All users must have a \"Member\" role."
@@ -6516,7 +6595,7 @@ msgstr "删除他们的帐户"
 
 #: users/admin/forms.py:364
 msgid "All ranks"
-msgstr "所有级"
+msgstr "所有级"
 
 #: users/admin/forms.py:368
 msgid "All roles"
@@ -6524,7 +6603,7 @@ msgstr "所有身份"
 
 #: users/admin/forms.py:374
 msgid "Has rank"
-msgstr "有级别"
+msgstr "有级别"
 
 #: users/admin/forms.py:377
 msgid "Has role"
@@ -6534,23 +6613,23 @@ msgstr "拥有身份"
 msgid ""
 "Short and descriptive name of all users with this rank. \"The Team\" or "
 "\"Game Masters\" are good examples."
-msgstr "该级别的用户的短的描述性名字。“团队” 或者 “游戏大师” 都是好的例子。"
+msgstr "该级别的用户简短描述性名字。比如\"开发团队\"或者\"游戏大师”。"
 
 #: users/admin/forms.py:394
 msgid "User title"
-msgstr "用户"
+msgstr "用户外号"
 
 #: users/admin/forms.py:397
 msgid ""
 "Optional, singular version of rank name displayed by user names. For example"
 " \"GM\" or \"Dev\"."
-msgstr "可选,通过用户名展示的级别名称。例如 “游戏大师” 或 “开发”。"
+msgstr "可选,展示在用户名旁边的级别名称。例如 “游戏大师” 或 “开发”。"
 
 #: users/admin/forms.py:407
 msgid ""
 "Optional description explaining function or status of members distincted "
 "with this rank."
-msgstr "用于解释此级别成员的功能和地位的描述 (可选)"
+msgstr "用于解释此级别成员的功能和地位的描述 (可选)"
 
 #: users/admin/forms.py:412
 msgid "User roles"
@@ -6562,11 +6641,11 @@ msgstr "级别可以为用户提供额外身份。"
 
 #: users/admin/forms.py:422
 msgid "Optional css class added to content belonging to this rank owner."
-msgstr "可选的css类,添加到该等级的用户的内容中。"
+msgstr "可选的 css class,添加到该等级的用户卡片边框。"
 
 #: users/admin/forms.py:426
 msgid "Give rank dedicated tab on users list"
-msgstr "给用户列表添加级别专用标签"
+msgstr "将此级别显示到用户标签"
 
 #: users/admin/forms.py:429
 msgid ""
@@ -6580,20 +6659,20 @@ msgstr "与其他级别重名。"
 
 #: users/admin/forms.py:454
 msgid "Values to ban"
-msgstr "封禁值"
+msgstr "封禁值"
 
 #: users/admin/forms.py:460
 msgid "Optional message displayed to users instead of default one."
-msgstr "用来代替默认消息显示给用户的消息。(可选)"
+msgstr "用来代替默认信息呈现给用户。(可选)"
 
 #: users/admin/forms.py:463 users/admin/forms.py:473 users/admin/forms.py:530
 #: users/admin/forms.py:540
 msgid "Message can't be longer than 1000 characters."
-msgstr "息不能超过 1000 个字符。"
+msgstr "息不能超过 1000 个字符。"
 
 #: users/admin/forms.py:467 users/admin/forms.py:534
 msgid "Team message"
-msgstr "团队讯息"
+msgstr "管理团队讯息"
 
 #: users/admin/forms.py:470 users/admin/forms.py:537
 msgid "Optional ban message for moderators and administrators."
@@ -6617,7 +6696,7 @@ msgstr "IP 地址第一段"
 
 #: users/admin/forms.py:494
 msgid "First two segments of IP addresses"
-msgstr "前两个 IP 地址段"
+msgstr "IP 地址前两段"
 
 #: users/admin/forms.py:500
 msgid "Check type"
@@ -6633,30 +6712,30 @@ msgid ""
 "registration step. This is good if you want to block certain registrations "
 "like ones from recently comprimised e-mail providers, without harming "
 "existing users."
-msgstr "设置为 “是” 可以使得该封禁只在注册步骤生效。例如,这能帮助你阻止来自近期被攻击的电子邮件提供商的用户注册,而不影响现有的用户。"
+msgstr "设置为“是”可以使得该封禁只在注册步骤生效。这能帮助你阻止来自近期被攻击的电子邮件提供商的用户注册,而不影响现有的用户。"
 
 #: users/admin/forms.py:512
 msgid "Banned value"
-msgstr "封禁值"
+msgstr "封禁值"
 
 #: users/admin/forms.py:515
 msgid ""
 "This value is case-insensitive and accepts asterisk (*) for rought matches. "
 "For example, making IP ban for value \"83.*\" will ban all IP addresses "
 "beginning with \"83.\"."
-msgstr "这个值不区分大小写,并接受*作为通配符。例如,\"83.*\"的封禁将会禁止所有以\"83.\"开头的IP地址。"
+msgstr "这个值不区分大小写,并接受*作为通配符。例如,设置IP封禁为\"83.*\",将会禁止所有以\"83.\"开头的 IP 地址。"
 
 #: users/admin/forms.py:520
 msgid "Banned value can't be longer than 250 characters."
-msgstr "封禁值不能超过250个字符。"
+msgstr "封禁值不能超过250个字符。"
 
 #: users/admin/forms.py:527
 msgid "Optional message displayed to user instead of default one."
-msgstr "代替默认消息显示给用户。(可选)"
+msgstr "代替默认显示给用户的消息。(可选)"
 
 #: users/admin/forms.py:562
 msgid "Banned value is too vague."
-msgstr "封禁值太含糊。"
+msgstr "封禁值太含糊。"
 
 #: users/admin/forms.py:572
 msgid "All bans"
@@ -6668,11 +6747,11 @@ msgstr "IPs"
 
 #: users/admin/forms.py:578
 msgid "Banned value begins with"
-msgstr "封禁值开头"
+msgstr "封禁值开头"
 
 #: users/admin/forms.py:582 users/admin/forms.py:587
 msgid "Any"
-msgstr "任"
+msgstr "任"
 
 #: users/admin/forms.py:622
 msgid "Usernames or emails"
@@ -6696,15 +6775,15 @@ msgstr "你不能一次输入超过 20 个项目(你已输入 %(show_value)s 
 
 #: users/admin/forms.py:660
 msgid "One or more specified users could not be found."
-msgstr "无法找到指定的一个或多个用户。"
+msgstr "找到一个或多个指定的用户。"
 
 #: users/admin/views/bans.py:14
 msgid "Requested ban does not exist."
-msgstr "请求的封禁不存在。"
+msgstr "请求的封禁不存在。"
 
 #: users/admin/views/bans.py:30
 msgid "With bans: 0"
-msgstr "封禁: 0"
+msgstr "已选封禁: 0"
 
 #: users/admin/views/bans.py:31
 msgid "Select bans"
@@ -6730,16 +6809,16 @@ msgstr "已保存新封禁 “%(name)s”。"
 #: users/admin/views/bans.py:51
 #, python-format
 msgid "Ban \"%(name)s\" has been edited."
-msgstr "封禁 “%(name)s” 已经被编辑。"
+msgstr "已编辑封禁 “%(name)s”。"
 
 #: users/admin/views/bans.py:58
 #, python-format
 msgid "Ban \"%(name)s\" has been removed."
-msgstr "封禁 “%(name)s” 已经被移除。"
+msgstr "已移除封禁 \"%(name)s\"。"
 
 #: users/admin/views/datadownloads.py:23
 msgid "With data downloads: 0"
-msgstr "数据下载:0"
+msgstr "已选数据下载: 0"
 
 #: users/admin/views/datadownloads.py:24
 msgid "Select data downloads"
@@ -6763,7 +6842,7 @@ msgstr "你确定要删除选定的数据下载吗?"
 
 #: users/admin/views/datadownloads.py:52
 msgid "Selected data downloads have been set as expired."
-msgstr "选定的数据下载已设置未过期。"
+msgstr "所选数据已设置为过期。"
 
 #: users/admin/views/datadownloads.py:59
 msgid "Selected data downloads have been deleted."
@@ -6771,7 +6850,7 @@ msgstr "已删除选定的数据。"
 
 #: users/admin/views/datadownloads.py:71
 msgid "Data downloads have been requested for specified users."
-msgstr "已为指定用户请求下载数据。"
+msgstr "已为指定用户请求数据下载。"
 
 #: users/admin/views/ranks.py:16
 msgid "Requested rank does not exist."
@@ -6780,7 +6859,7 @@ msgstr "请求的级别不存在。"
 #: users/admin/views/ranks.py:33
 #, python-format
 msgid "New rank \"%(name)s\" has been saved."
-msgstr "已保存新的级别 “%(name)s”。"
+msgstr "已保持新级别 \"%(name)s“ 。"
 
 #: users/admin/views/ranks.py:37
 #, python-format
@@ -6800,39 +6879,39 @@ msgstr "“%(name)s” 级别已分配到用户了,不能被删除。"
 #: users/admin/views/ranks.py:52
 #, python-format
 msgid "Rank \"%(name)s\" has been deleted."
-msgstr "已删除级别 “%(name)s”。"
+msgstr "已删除 “%(name)s” 级别。"
 
 #: users/admin/views/ranks.py:69
 #, python-format
 msgid "Rank \"%(name)s\" has been moved below \"%(other)s\"."
-msgstr "已移动 “%(name)s” 到 “%(other)s” 级别之下。"
+msgstr "\"%(name)s\" 级别已经被移动到 \"%(other)s\" 之下。"
 
 #: users/admin/views/ranks.py:87
 #, python-format
 msgid "Rank \"%(name)s\" has been moved above \"%(other)s\"."
-msgstr "已移动 “%(name)s” 到 “%(other)s” 级别之上。"
+msgstr "\"%(name)s\" 级别已经被移动到 \"%(other)s\" 之上。"
 
 #: users/admin/views/ranks.py:101
 #, python-format
 msgid "Rank \"%(name)s\" is already default."
-msgstr "“%(name)s” 已经是默认级别。"
+msgstr "“%(name)s\" 级别已经是默认等级。"
 
 #: users/admin/views/ranks.py:106
 #, python-format
 msgid "Rank \"%(name)s\" has been made default."
-msgstr "“%(name)s” 已设为默认级别。"
+msgstr "“%(name)s” 级别已设为默认级别。"
 
 #: users/admin/views/users.py:66
 msgid "Biggest posters"
-msgstr "最多发帖"
+msgstr "最多发帖"
 
 #: users/admin/views/users.py:67
 msgid "Smallest posters"
-msgstr "最发帖"
+msgstr "最发帖"
 
 #: users/admin/views/users.py:69
 msgid "With users: 0"
-msgstr "用户:0"
+msgstr "已选用户:0"
 
 #: users/admin/views/users.py:70
 msgid "Select users"
@@ -6862,11 +6941,11 @@ msgstr "同时删除内容"
 msgid ""
 "Are you sure you want to delete selected users? This will also delete all "
 "content associated with their accounts."
-msgstr "你确定要删除选定的用户吗?这也会删除所有和此账号关联的内容。"
+msgstr "你确定要删除选定的用户吗?将同时删除选定用户的所有内容。"
 
 #: users/admin/views/users.py:105
 msgid "You have to select inactive users."
-msgstr "你必须选择已冻结用户。"
+msgstr "你必须选择未激活的用户。"
 
 #: users/admin/views/users.py:112
 #, python-format
@@ -6880,7 +6959,7 @@ msgstr "选中的用户已经被激活。"
 #: users/admin/views/users.py:130
 #, python-format
 msgid "%(user)s is super admin and can't be banned."
-msgstr "%(user)s 是超级管理员,不能被封禁。"
+msgstr "%(user)s是超级管理员,不能被封禁。"
 
 #: users/admin/views/users.py:192
 msgid "Selected users have been banned."
@@ -6897,7 +6976,7 @@ msgstr "你不能删除自己。"
 #: users/admin/views/users.py:215 users/admin/views/users.py:230
 #, python-format
 msgid "%(user)s is admin and can't be deleted."
-msgstr "%(user)s 是管理员,不能被删除。"
+msgstr "%(user)s是管理员,不能被删除。"
 
 #: users/admin/views/users.py:223
 msgid "Selected users have been deleted."
@@ -6919,31 +6998,36 @@ msgstr "新用户 \"%(user)s\" 已成功注册。"
 msgid "User \"%(user)s\" has been edited."
 msgstr "已编辑用户 “%(user)s”。"
 
-#: users/api/auth.py:94
+#: users/api/auth.py:42 users/api/auth.py:92 users/api/auth.py:130
+#: users/api/auth.py:174
+msgid "Please use the 3rd party site to authenticate."
+msgstr ""
+
+#: users/api/auth.py:100
 #, python-format
 msgid "Activate %(user)s account on %(forum_name)s forums"
 msgstr "在 %(forum_name)s 论坛中激活 %(user)s 的账号"
 
-#: users/api/auth.py:129
+#: users/api/auth.py:138
 #, python-format
 msgid "Change %(user)s password on %(forum_name)s forums"
-msgstr "在 %(forum_name)s 论坛更改 %(user)s 密码"
+msgstr "在 %(forum_name)s 论坛中修改 %(user)s 的密码"
 
-#: users/api/auth.py:164
+#: users/api/auth.py:176
 msgid "Form link is invalid. Please try again."
 msgstr "表单链接无效。请再试一次。"
 
-#: users/api/auth.py:165
+#: users/api/auth.py:177
 msgid "Your link has expired. Please request new one."
-msgstr "你的链接已过期,请申请新的。"
+msgstr "你的链接已过期,请重新申请。"
 
 #: users/api/rest_permissions.py:30
 msgid "This action is not available to signed in users."
-msgstr "此操作无法登录用户。"
+msgstr "无法通过此操作登录。"
 
 #: users/api/userendpoints/avatar.py:26
 msgid "Your avatar is locked. You can't change it."
-msgstr "你的头像被锁定.你不能改变它。"
+msgstr "你的头像已被锁定,你不能再次修改。"
 
 #: users/api/userendpoints/avatar.py:109
 msgid "This avatar type is not allowed."
@@ -6959,11 +7043,11 @@ msgstr "根据你的账号设置了新的头像。"
 
 #: users/api/userendpoints/avatar.py:143
 msgid "Gravatar was downloaded and set as new avatar."
-msgstr "Gravatar 已下载并设置为新头像。"
+msgstr "Gravatar 已下载并设置为你的新头像。"
 
 #: users/api/userendpoints/avatar.py:145
 msgid "No Gravatar is associated with your e-mail address."
-msgstr "没有Gravatar与你的电子邮件地址相关联。"
+msgstr "没有与你的电子邮件地址相关联的 Gravatar。"
 
 #: users/api/userendpoints/avatar.py:147
 msgid "Failed to connect to Gravatar servers."
@@ -6971,128 +7055,148 @@ msgstr "无法连接到 Gravatar 服务器。"
 
 #: users/api/userendpoints/avatar.py:157
 msgid "Avatar from gallery was set."
-msgstr "画廊的头像已经设置好了。"
+msgstr "已设为图库头像。"
 
 #: users/api/userendpoints/avatar.py:159
 msgid "Incorrect image."
-msgstr "图片不正确。"
+msgstr "无效图片。"
 
 #: users/api/userendpoints/avatar.py:165
 msgid "No file was sent."
-msgstr "没有发送文件。"
+msgstr "发送文件。"
 
 #: users/api/userendpoints/avatar.py:178
 msgid "Avatar was re-cropped."
-msgstr "头像重新裁剪。"
+msgstr "头像重新裁剪。"
 
 #: users/api/userendpoints/avatar.py:183
 msgid "Uploaded avatar was set."
-msgstr "上传的头像已经设置。"
+msgstr "已设为上传的头像。"
 
 #: users/api/userendpoints/changeemail.py:22
 #, python-format
 msgid "Confirm e-mail change on %(forum_name)s forums"
-msgstr "确认修改 %(forum_name)s 论坛上的电子邮件"
+msgstr "确认修改 %(forum_name)s 上的账户电子邮件"
 
 #: users/api/userendpoints/changeemail.py:35
 msgid "E-mail change confirmation link was sent to new address."
-msgstr "电子邮件更改确认链接已经发送到新地址。"
+msgstr "修改电子邮件确认链接已经发送到新的邮件地址。"
 
 #: users/api/userendpoints/changepassword.py:22
 #, python-format
 msgid "Confirm password change on %(forum_name)s forums"
-msgstr "确认更改 %(forum_name)s 论坛上的密码"
+msgstr "确认修改 %(forum_name)s 论坛上的账号密码"
 
 #: users/api/userendpoints/changepassword.py:33
 msgid "Password change confirmation link was sent to your address."
-msgstr "密码更改确认链接已经发送到你的地址。"
+msgstr "确认修改密码链接已经发送到你的邮箱,请查收。"
 
 #: users/api/userendpoints/create.py:25
 msgid "New users registrations are currently closed."
-msgstr "新用户注册目前已关闭。"
+msgstr "已关闭新用户注册。"
 
 #: users/api/userendpoints/signature.py:13
 msgid "You don't have permission to change signature."
-msgstr "你没有改签名的权限。"
+msgstr "你没有改签名的权限。"
 
 #: users/api/userendpoints/signature.py:25
 msgid "Your signature is locked. You can't change it."
-msgstr "你的签名被锁定,你不能改它。"
+msgstr "你的签名被锁定,你不能改它。"
 
 #: users/api/userendpoints/username.py:32
 msgid "You can't change your username now."
-msgstr "你现在无法改用户名。"
+msgstr "你现在无法改用户名。"
 
 #: users/api/userendpoints/username.py:60
 #: users/api/userendpoints/username.py:82
 msgid "Error changing username. Please try again."
-msgstr "改用户名时出错,请再试一次。"
+msgstr "改用户名时出错,请再试一次。"
 
 #: users/api/usernamechanges.py:28
 msgid "You don't have permission to see other users name history."
-msgstr "你没有权限查看其他用户名称历史记录。"
+msgstr "你无法查看其他用户名称的历史记录。"
 
 #: users/api/users.py:63
 msgid "You have to sign in to perform this action."
 msgstr "你必须登录才能执行此操作。"
 
-#: users/api/users.py:109
+#: users/api/users.py:89
+msgid "Please use the 3rd party site to register."
+msgstr ""
+
+#: users/api/users.py:112
 msgid "You can't change other users avatars."
-msgstr "你不能改变其他用户的头像。"
+msgstr "你无法修改其他用户的头像。"
 
-#: users/api/users.py:121
+#: users/api/users.py:124
 msgid "You can't change other users options."
 msgstr "你不能更改其他用户选项。"
 
-#: users/api/users.py:126
+#: users/api/users.py:129
 msgid "Your forum options have been changed."
-msgstr "你的论坛设置已改。"
+msgstr "你的论坛设置已改。"
 
-#: users/api/users.py:132
+#: users/api/users.py:136
+msgid "Please use the 3rd party site to change your username."
+msgstr ""
+
+#: users/api/users.py:140
 msgid "You can't change other users names."
-msgstr "你不能更改其他用户名。"
+msgstr "你不能修改其他用户的名称。"
 
-#: users/api/users.py:139
+#: users/api/users.py:147
 msgid "You can't change other users signatures."
-msgstr "你不能更改其他用户签名。"
+msgstr "你不能修改其他用户的签名。"
+
+#: users/api/users.py:160
+msgid "Please use the 3rd party site to change your password."
+msgstr ""
 
-#: users/api/users.py:151
+#: users/api/users.py:164
 msgid "You can't change other users passwords."
-msgstr "你不能更改其他用户的密码。"
+msgstr "你不能修改其他用户的密码。"
+
+#: users/api/users.py:174
+msgid "Please use the 3rd party site to change your e-mail."
+msgstr ""
 
-#: users/api/users.py:161
+#: users/api/users.py:179
 msgid "You can't change other users e-mail addresses."
-msgstr "你不能更改其他用户的电子邮件地址。"
+msgstr "你不能改其他用户的电子邮件地址。"
 
-#: users/api/users.py:268
+#: users/api/users.py:210
+msgid "Please use the 3rd party site to delete account."
+msgstr ""
+
+#: users/api/users.py:291
 msgid "You can't request data downloads for other users."
 msgstr "你不能为其他用户请求数据下载。"
 
-#: users/api/users.py:272
+#: users/api/users.py:295
 msgid "You can't download your data."
-msgstr "你无法下载数据。"
+msgstr "你不能下载你的数据。"
 
-#: users/api/users.py:277
+#: users/api/users.py:300
 msgid "You can't have more than one data download request at a single time."
 msgstr "你不能一次请求多个数据下载。"
 
-#: users/api/users.py:333
+#: users/api/users.py:356
 msgid "You can't see other users data downloads."
-msgstr "你无法看到其他用户可下载数据。"
+msgstr "你无法看到其他用户的数据下载。"
 
-#: users/apps.py:30
+#: users/apps.py:33
 msgid "Edit details"
 msgstr "编辑详情"
 
-#: users/apps.py:36
+#: users/apps.py:39
 msgid "Change username"
-msgstr "改用户名"
+msgstr "改用户名"
 
-#: users/apps.py:42
+#: users/apps.py:46
 msgid "Change email or password"
-msgstr "改电子邮件或密码"
+msgstr "改电子邮件或密码"
 
-#: users/apps.py:63
+#: users/apps.py:71
 msgid "Delete account"
 msgstr "删除帐号"
 
@@ -7102,12 +7206,12 @@ msgstr "上传的文件太大。"
 
 #: users/avatars/uploaded.py:46 users/avatars/uploaded.py:51
 msgid "Uploaded file type is not allowed."
-msgstr "不允许上传文件类型。"
+msgstr "不允许上传文件类型。"
 
 #: users/avatars/uploaded.py:59
 #, python-format
 msgid "Uploaded image should be at least %(size)s pixels tall and wide."
-msgstr "上传的图片至少应该是 %(size)s 像素高和宽。"
+msgstr "上传的图片至少需要 %(size)s 像素高和宽。"
 
 #: users/avatars/uploaded.py:63
 msgid "Uploaded image is too big."
@@ -7119,7 +7223,7 @@ msgstr "上传图片比例不能大于 16:9。"
 
 #: users/avatars/uploaded.py:74
 msgid "Crop data is invalid. Please try again."
-msgstr "修改的数据不可用,请重试。"
+msgstr "裁剪图片失败,请重试。"
 
 #: users/captcha.py:21
 msgid "Failed to contact reCAPTCHA API."
@@ -7127,11 +7231,11 @@ msgstr "无法连接到 reCAPTCHA API。"
 
 #: users/captcha.py:28
 msgid "Entered answer is incorrect."
-msgstr "输入的答案不正确。"
+msgstr "输入的答案不正确。"
 
 #: users/decorators.py:14
 msgid "This page is not available to signed in users."
-msgstr "此页面无法登录用户。"
+msgstr "已登录用户无法访问此页面。"
 
 #: users/decorators.py:26
 msgid "You have to sign in to access this page."
@@ -7139,11 +7243,11 @@ msgstr "你必须登录才能访问此页面。"
 
 #: users/forms/auth.py:15
 msgid "Fill out both fields."
-msgstr "填写两个字段。"
+msgstr "填写所需的字段。"
 
 #: users/forms/auth.py:16
 msgid "Login or password is incorrect."
-msgstr "登录或密码不正确。"
+msgstr "用户名或密码不正确。"
 
 #: users/forms/auth.py:18
 msgid "You have to activate your account before you will be able to sign in."
@@ -7153,7 +7257,7 @@ msgstr "你必须先激活账号才能登录。"
 msgid ""
 "Your account has to be activated by site administrator before you will be "
 "able to sign in."
-msgstr "你的帐户必须由网站管理员激活,然后才能登录。"
+msgstr "你的账户必须通过网站管理员激活,才可以登录。"
 
 #: users/forms/auth.py:98
 msgid "Your account does not have admin privileges."
@@ -7171,7 +7275,7 @@ msgstr "输入的电子邮件无效。"
 msgid "No user with this e-mail exists."
 msgstr "没有使用此电子邮件的用户。"
 
-#: users/forms/auth.py:150 users/views/activation.py:45
+#: users/forms/auth.py:150 users/views/activation.py:51
 #, python-format
 msgid "%(user)s, your account is already active."
 msgstr "%(user)s,你的账号已激活。"
@@ -7191,15 +7295,11 @@ msgstr "你必须激活你的账号,然后才能申请新密码。"
 msgid ""
 "Administrator has to activate your account before you will be able to "
 "request new password."
-msgstr "管理员必须激活你的账号,你才能申请新密码。"
+msgstr "请耐心等待管理员激活你的账号,然后你才能申请新密码。"
 
 #: users/forms/register.py:34
 msgid "This usernane is not allowed."
-msgstr "此用户名不允许。"
-
-#: users/forms/register.py:45 users/validators.py:51
-msgid "This e-mail address is not allowed."
-msgstr "该电子邮件地址是不允许的。"
+msgstr "不能使用此用户名。"
 
 #: users/forms/register.py:51
 msgid "This agreement is required."
@@ -7207,7 +7307,7 @@ msgstr "此协议是必需项。"
 
 #: users/forms/register.py:61
 msgid "New registrations from this IP address are not allowed."
-msgstr "不允许从该IP地址注册。"
+msgstr "不允许从该 IP 地址注册。"
 
 #: users/management/commands/prepareuserdatadownloads.py:38
 #, python-format
@@ -7226,7 +7326,7 @@ msgstr "团队"
 #: users/migrations/0004_default_ranks.py:22
 #: users/migrations/0004_default_ranks.py:23
 msgid "Members"
-msgstr "论坛成员"
+msgstr "成员"
 
 #: users/models/datadownload.py:26
 msgid "Pending"
@@ -7242,15 +7342,15 @@ msgstr "已完成"
 
 #: users/models/user.py:106
 msgid "Notify"
-msgstr "通知"
+msgstr "站点通知"
 
 #: users/models/user.py:107
 msgid "Notify with e-mail"
-msgstr "通过电子邮件通知"
+msgstr "电子邮件通知"
 
 #: users/models/user.py:115
 msgid "Everybody"
-msgstr "大家"
+msgstr "所有人"
 
 #: users/models/user.py:116
 msgid "Users I follow"
@@ -7258,11 +7358,11 @@ msgstr "我关注的用户"
 
 #: users/models/user.py:117
 msgid "Nobody"
-msgstr "没有人"
+msgstr "不接受"
 
 #: users/models/user.py:136
 msgid "joined on"
-msgstr "加入"
+msgstr "加入"
 
 #: users/models/user.py:148
 msgid "staff status"
@@ -7288,51 +7388,51 @@ msgstr "账号设定"
 
 #: users/permissions/account.py:13
 msgid "Allowed username changes number"
-msgstr "允许用户名改次数"
+msgstr "允许用户名改次数"
 
 #: users/permissions/account.py:16
 msgid "Don't count username changes older than"
-msgstr "更改给定天数后,不再算入用户名改变次数"
+msgstr "限制修改用户名时间"
 
 #: users/permissions/account.py:18
 msgid ""
 "Number of days since name change that makes that change no longer count to "
 "limit. Enter zero to make all changes count."
-msgstr "用户名更改后的天数,使更改不再计入限制。输入0以使所有更改计数。"
+msgstr "当改动超过设置的时间,不再计入修改次数。输入0将使所有修改计数。"
 
 #: users/permissions/account.py:25
 msgid "Can have signature"
-msgstr "可有签名"
+msgstr "可有签名"
 
 #: users/permissions/account.py:26
 msgid "Can put links in signature"
-msgstr "可在签名中放入链接"
+msgstr "可在签名中放入链接"
 
 #: users/permissions/account.py:27
 msgid "Can put images in signature"
-msgstr "可以将图片放入签名"
+msgstr "可在签名中添加图片"
 
 #: users/permissions/account.py:29
 msgid "Can use text blocks in signature"
-msgstr "可在签名中使用文本块"
+msgstr "可在签名中使用文本块"
 
 #: users/permissions/account.py:31
 msgid ""
 "Controls whether or not users can put quote, code, spoiler blocks and "
 "horizontal lines in signatures."
-msgstr "控制用户是否可以在签名中放置引用,代码,扰流块和水平线。"
+msgstr "控制用户是否可以在签名中放置引用,代码,扰流块和删除线。"
 
 #: users/permissions/decorators.py:10
 msgid "You have to sig in to perform this action."
-msgstr "你必须登录后才能行此操作。"
+msgstr "你必须登录后才能行此操作。"
 
 #: users/permissions/decorators.py:19
 msgid "Only guests can perform this action."
-msgstr "只有访客可以进行此操作。"
+msgstr "访客可以进行此操作。"
 
 #: users/permissions/delete.py:26
 msgid "Maximum age of deleted account (in days)"
-msgstr "删除账号的最大年龄(以天为单位)"
+msgstr "可删除账号的站龄(以天为单位)"
 
 #: users/permissions/delete.py:27 users/permissions/delete.py:33
 msgid "Enter zero to disable this check."
@@ -7348,7 +7448,7 @@ msgstr "你无法删除用户。"
 
 #: users/permissions/delete.py:77 users/permissions/delete.py:106
 msgid "You can't delete your account."
-msgstr "你不能删除你的帐户。"
+msgstr "你无法删除自己的账号。"
 
 #: users/permissions/delete.py:79
 msgid "You can't delete administrators."
@@ -7359,17 +7459,17 @@ msgstr "你不能删除管理员。"
 msgid "You can't delete users that are members for more than %(days)s day."
 msgid_plural ""
 "You can't delete users that are members for more than %(days)s days."
-msgstr[0] "你不能删除已经成为成员超过 %(days)s 天的用户。"
+msgstr[0] "你不能删除站龄超过 %(days)s 天的用户。"
 
 #: users/permissions/delete.py:92
 #, python-format
 msgid "You can't delete users that made more than %(posts)s post."
 msgid_plural "You can't delete users that made more than %(posts)s posts."
-msgstr[0] "你不能删除发帖数超过 %(posts)s 的用户。"
+msgstr[0] "你不能删除发帖数超过 %(posts)s 的用户。"
 
 #: users/permissions/delete.py:104
 msgid "You can't delete other users accounts."
-msgstr "你不能删除其他用户帐户。"
+msgstr "你无法删除其他成员账号。"
 
 #: users/permissions/delete.py:109
 msgid "You can't delete your account because you are an administrator."
@@ -7381,39 +7481,39 @@ msgstr "用户审查"
 
 #: users/permissions/moderation.py:35
 msgid "Can rename users"
-msgstr "可重命名用户"
+msgstr "可重命名用户"
 
 #: users/permissions/moderation.py:36
 msgid "Can moderate avatars"
-msgstr "可审查头像"
+msgstr "可审查头像"
 
 #: users/permissions/moderation.py:37
 msgid "Can moderate signatures"
-msgstr "可审查签名"
+msgstr "可审查签名"
 
 #: users/permissions/moderation.py:38
 msgid "Can moderate profile details"
-msgstr "可审查个人资料"
+msgstr "可审查个人资料"
 
 #: users/permissions/moderation.py:39
 msgid "Can ban users"
-msgstr "可封禁用户"
+msgstr "可封禁用户"
 
 #: users/permissions/moderation.py:41
 msgid "Max length, in days, of imposed ban"
-msgstr "可以施加的封禁的最大长度,以天为单位"
+msgstr "可施加封禁的最多天数"
 
 #: users/permissions/moderation.py:42
 msgid "Enter zero to let moderators impose permanent bans."
-msgstr "输入0,允许版主施加永久封禁。"
+msgstr "输入0,允许版主施加永久封禁。"
 
 #: users/permissions/moderation.py:46
 msgid "Can lift bans"
-msgstr "可解除封禁"
+msgstr "可解除封禁"
 
 #: users/permissions/moderation.py:48
 msgid "Max length, in days, of lifted ban"
-msgstr "可以解除的封禁最大长度,以天为单位"
+msgstr "可解除封禁的最多天数"
 
 #: users/permissions/moderation.py:49
 msgid "Enter zero to let moderators lift permanent bans."
@@ -7449,7 +7549,7 @@ msgstr "你需要登录才能编辑个人资料。"
 
 #: users/permissions/moderation.py:147
 msgid "You can't edit other users details."
-msgstr "你不能编辑别人的个人资料。"
+msgstr "你不能编辑其他用户个人资料。"
 
 #: users/permissions/moderation.py:149
 msgid "You can't edit administrators details."
@@ -7465,7 +7565,7 @@ msgstr "你无法封禁管理员。"
 
 #: users/permissions/moderation.py:168
 msgid "You can't lift bans."
-msgstr "你不能解除永久封禁。"
+msgstr "你不能解除封禁。"
 
 #: users/permissions/moderation.py:171
 msgid "This user is not banned."
@@ -7473,28 +7573,28 @@ msgstr "该用户未被封禁。"
 
 #: users/permissions/moderation.py:176
 msgid "You can't lift permanent bans."
-msgstr "你不能接触封禁。"
+msgstr "你不能解除永久封禁。"
 
 #: users/permissions/moderation.py:178
 #, python-format
 msgid "You can't lift bans that expire after %(expiration)s."
-msgstr "你不能除在 %(expiration)s 后到期的封禁。"
+msgstr "你不能除在 %(expiration)s 后到期的封禁。"
 
 #: users/permissions/profiles.py:23
 msgid "Can browse users list"
-msgstr "可浏览用户列表"
+msgstr "可浏览用户列表"
 
 #: users/permissions/profiles.py:24
 msgid "Can search user profiles"
-msgstr "可搜索用户个人资料"
+msgstr "可搜索用户个人资料"
 
 #: users/permissions/profiles.py:25
 msgid "Can see other members name history"
-msgstr "可以看到其他成员的名称历史"
+msgstr "可查看其他成员的名称历史"
 
 #: users/permissions/profiles.py:27
 msgid "Can see members bans details"
-msgstr "可以看到成员的封禁细节"
+msgstr "可查看成员的封禁细节"
 
 #: users/permissions/profiles.py:29
 msgid "Allows users with this permission to see user and staff ban messages."
@@ -7506,23 +7606,23 @@ msgstr "用户个人资料"
 
 #: users/permissions/profiles.py:46
 msgid "Can follow other users"
-msgstr "可关注其他用户"
+msgstr "可关注其他用户"
 
 #: users/permissions/profiles.py:47
 msgid "Can be blocked by other users"
-msgstr "可被其他用户屏蔽"
+msgstr "可被其他用户拉黑"
 
 #: users/permissions/profiles.py:50
 msgid "Can see members e-mails"
-msgstr "可以看到成员的电子邮件"
+msgstr "可查看成员的电子邮件"
 
 #: users/permissions/profiles.py:51
 msgid "Can see members IPs"
-msgstr "可以看到成员IP"
+msgstr "可查看成员 IP 地址"
 
 #: users/permissions/profiles.py:53
 msgid "Can see members that hide their presence"
-msgstr "可以看到隐藏的成员"
+msgstr "可查看隐身的成员"
 
 #: users/permissions/profiles.py:113
 msgid "You can't browse users list."
@@ -7534,19 +7634,19 @@ msgstr "你不能关注其他用户。"
 
 #: users/permissions/profiles.py:124
 msgid "You can't add yourself to followed."
-msgstr "你不能把自己添加为关注者。"
+msgstr "你不能关注自己。"
 
 #: users/permissions/profiles.py:133
 msgid "You can't block administrators."
-msgstr "你无法屏蔽管理员。"
+msgstr "你不能拉黑管理员。"
 
 #: users/permissions/profiles.py:135
 msgid "You can't block yourself."
-msgstr "你不能屏蔽自己。"
+msgstr "你不能拉黑自己。"
 
 #: users/permissions/profiles.py:145
 msgid "You can't see users bans details."
-msgstr "你看不到用户封禁详细信息。"
+msgstr "你无法查看用户封禁详情。"
 
 #: users/profilefields/default.py:12
 msgid "Bio"
@@ -7570,7 +7670,7 @@ msgstr "未指定"
 
 #: users/profilefields/default.py:31
 msgid "Not telling"
-msgstr "未标注"
+msgstr "你猜"
 
 #: users/profilefields/default.py:32
 msgid "Female"
@@ -7626,11 +7726,11 @@ msgstr "加入时 IP"
 #: users/registration.py:12
 #, python-format
 msgid "Welcome on %(forum_name)s forums!"
-msgstr "欢迎来到 %(forum_name)s 论坛!"
+msgstr "欢迎加入 %(forum_name)s论坛!"
 
 #: users/search.py:22
 msgid "You don't have permission to search users."
-msgstr "你没有权限搜索用户。"
+msgstr "你无法搜索用户。"
 
 #: users/serializers/ban.py:26
 msgid "Your IP address is banned."
@@ -7689,63 +7789,71 @@ msgstr "此电子邮件地址不可用。"
 msgid "This username is not available."
 msgstr "此用户名不可用。"
 
-#: users/validators.py:79
-msgid "This username is not allowed."
-msgstr "不允许使用此用户名。"
-
 #: users/validators.py:85
 msgid "Username can only contain latin alphabet letters and digits."
-msgstr "用户名只包含拉丁字母和数字。"
+msgstr "用户名只可以包含拉丁字母和数字。"
 
 #: users/validators.py:92
 #, python-format
 msgid "Username must be at least %(limit_value)s character long."
 msgid_plural "Username must be at least %(limit_value)s characters long."
-msgstr[0] "用户名少需要 %(limit_value)s 个字符。"
+msgstr[0] "用户名少需要 %(limit_value)s 个字符。"
 
 #: users/validators.py:100
 #, python-format
 msgid "Username cannot be longer than %(limit_value)s characters."
 msgid_plural "Username cannot be longer than %(limit_value)s characters."
-msgstr[0] "用户名不超过 %(limit_value)s 个字符。"
+msgstr[0] "用户名不可以超过 %(limit_value)s 个字符。"
 
 #: users/validators.py:136
 msgid "Data entered was found in spammers database."
-msgstr "输入的数据在垃圾邮件发送者数据库中找到。"
+msgstr "输入的数据被禁止或不合法。"
 
 #: users/validators.py:146
 msgid "This email is not allowed."
-msgstr "此电子邮件不被许可。"
+msgstr "此电子邮件不可。"
 
-#: users/views/activation.py:50
+#: users/views/activation.py:21
+msgid "Please use the 3rd party site to activate your account."
+msgstr ""
+
+#: users/views/activation.py:56
 #, python-format
 msgid ""
 "%(user)s, your activation link is invalid. Try again or request new "
 "activation link."
-msgstr "%(user)s,你的激活链接不可用,请重试或者申请一个新的链接。"
+msgstr "%(user)s,你的激活链接无效,请重试或者重新申请激活链接。"
 
-#: users/views/activation.py:68
+#: users/views/activation.py:74
 #, python-format
 msgid "%(user)s, your account has been activated!"
-msgstr "%(user)s,你的账号已经被激活!"
+msgstr "%(user)s,你的账号已激活!"
+
+#: users/views/forgottenpassword.py:18 users/views/options.py:70
+msgid "Please use the 3rd party site to change password."
+msgstr ""
 
-#: users/views/forgottenpassword.py:39
+#: users/views/forgottenpassword.py:45
 #, python-format
 msgid ""
 "%(user)s, your link has expired. Please request new link and try again."
 msgstr "%(user)s,你的链接已经过期,请申请一个新链接并重试。"
 
-#: users/views/forgottenpassword.py:46
+#: users/views/forgottenpassword.py:52
 #, python-format
 msgid "%(user)s, your link is invalid. Please try again or request new link."
 msgstr "%(user)s,你的链接不可用,请重试并申请一个新链接。"
 
-#: users/views/options.py:55
+#: users/views/options.py:47
+msgid "Please use the 3rd party site to change e-mail."
+msgstr ""
+
+#: users/views/options.py:59
 #, python-format
 msgid "%(user)s, your e-mail has been changed."
-msgstr "%(user)s, 你的电子邮件已修改。"
+msgstr "%(user)s, 你的电子邮件已修改。"
 
-#: users/views/options.py:73
+#: users/views/options.py:80
 #, python-format
 msgid "%(user)s, your password has been changed."
-msgstr "%(user)s,你的密码已经改变。"
+msgstr "%(user)s,你的密码已被修改。"

BIN
misago/locale/zh_Hans/LC_MESSAGES/djangojs.mo


+ 280 - 275
misago/locale/zh_Hans/LC_MESSAGES/djangojs.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-07-13 14:07+0000\n"
+"POT-Creation-Date: 2019-09-01 14:10+0000\n"
 "PO-Revision-Date: 2017-01-16 00:04+0000\n"
 "Last-Translator: 蚂蚁先生 <pzf_karl@hotmail.com>, 2019\n"
 "Language-Team: Chinese (China) (https://www.transifex.com/misago/teams/65369/zh_CN/)\n"
@@ -27,7 +27,7 @@ msgstr ""
 
 #: static/misago/admin/index.js:16
 msgid "defineLocaleOverride"
-msgstr ""
+msgstr "defineLocaleOverride"
 
 #: static/misago/js/es2015.js:1 static/misago/js/polyfill.js:1
 msgid "delete"
@@ -35,19 +35,19 @@ msgstr "删除"
 
 #: static/misago/js/es2015.js:1 static/misago/js/polyfill.js:1
 msgid "has"
-msgstr "有"
+msgstr "有"
 
 #: static/misago/js/es2015.js:1 static/misago/js/polyfill.js:1
 msgid "get"
-msgstr "得到"
+msgstr "获取"
 
 #: static/misago/js/es2015.js:2
 msgid "Promise-chain cycle"
-msgstr ""
+msgstr "Promise-chain cycle"
 
 #: static/misago/js/es2015.js:2
 msgid "Promise can't be resolved itself"
-msgstr ""
+msgstr "Promise can't be resolved itself"
 
 #: static/misago/js/misago.js:1
 msgid "the terms of service"
@@ -59,13 +59,13 @@ msgstr "隐私政策"
 
 #: static/misago/js/misago.js:1
 msgid "I have read and accept %(agreement)s."
-msgstr "我已阅读完毕并接受 %(agreement)s。"
+msgstr "我已阅读并接受 %(agreement)s。"
 
 #: static/misago/js/misago.js:1
 msgid ""
 "Declining will result in immediate deactivation and deletion of your "
 "account. This action is not reversible."
-msgstr "拒绝将立即停用并删除你的帐户。此操作是不可逆的。"
+msgstr "拒绝将导致立即停用和删除你的帐号。此操作不可逆。"
 
 #: static/misago/js/misago.js:1
 msgid "Decline"
@@ -84,7 +84,7 @@ msgstr "接受并继续"
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:18
 #: static/misago/js/misago.js:19 static/misago/js/misago.js:20
 msgid "Close"
-msgstr "未订阅"
+msgstr "关闭"
 
 #: static/misago/js/misago.js:1 static/misago/js/misago.js:6
 msgid "Add participant"
@@ -96,18 +96,18 @@ msgstr "你必须输入用户名。"
 
 #: static/misago/js/misago.js:1
 msgid "New participant has been added to thread."
-msgstr "新参与者已添加到话题。"
+msgstr "新参与者已添加到话题。"
 
 #: static/misago/js/misago.js:1
 msgid "User to add"
-msgstr "添加用户"
+msgstr "添加用户"
 
 #: static/misago/js/misago.js:1 static/misago/js/misago.js:2
 #: static/misago/js/misago.js:3 static/misago/js/misago.js:4
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:13
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:17
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid "Cancel"
 msgstr "取消"
 
@@ -129,7 +129,7 @@ msgstr "重新加载页面"
 
 #: static/misago/js/misago.js:1
 msgid "or press F5 key."
-msgstr "或按 F5 键。"
+msgstr "或按F5键。"
 
 #: static/misago/js/misago.js:1 static/misago/js/misago.js:11
 msgid "This ban expires on %(expires_on)s."
@@ -141,11 +141,11 @@ msgstr "此封禁 %(expires_on)s 过期。"
 
 #: static/misago/js/misago.js:1 static/misago/js/misago.js:11
 msgid "This ban has expired."
-msgstr "封禁已过期。"
+msgstr "封禁已过期。"
 
 #: static/misago/js/misago.js:1
 msgid "This ban is permanent."
-msgstr "此封禁是永久的。如需投诉请联系管理员。"
+msgstr "永久封禁。"
 
 #: static/misago/js/misago.js:1
 msgid "No categories exist or you don't have permission to see them."
@@ -161,7 +161,7 @@ msgstr "此版块有新帖子。 (已关闭)"
 
 #: static/misago/js/misago.js:1
 msgid "This category has no new posts."
-msgstr "此版块没有新帖子。 (已关闭)"
+msgstr "此版块没有新帖子。"
 
 #: static/misago/js/misago.js:1
 msgid "This category has new posts."
@@ -169,15 +169,15 @@ msgstr "此版块有新帖子。"
 
 #: static/misago/js/misago.js:1
 msgid "This category is empty. No threads were posted within it so far."
-msgstr "该版块为空,尚不存在该版块的话题。"
+msgstr "该版块为空,此版块目前尚未发表话题。"
 
 #: static/misago/js/misago.js:1
 msgid "This category is private. You can see only your own threads within it."
-msgstr "此版块是私有的。你只可以看到你自己的该版块的话题。"
+msgstr "这个板块已开启隐蔽模式。你仅可以看到你自己的话题。"
 
 #: static/misago/js/misago.js:1
 msgid "This category is protected. You can't browse it's contents."
-msgstr "此版块访问权受限。你不可以浏览其内容。"
+msgstr "此版块已锁定。你暂时无法浏览。"
 
 #: static/misago/js/misago.js:1 static/misago/js/misago.js:21
 msgid "%(threads)s thread"
@@ -188,7 +188,7 @@ msgstr[0] "%(threads)s 个话题"
 #: static/misago/js/misago.js:21
 msgid "%(posts)s post"
 msgid_plural "%(posts)s posts"
-msgstr[0] "%(posts)s 帖子"
+msgstr[0] "%(posts)s 帖子"
 
 #: static/misago/js/misago.js:1
 msgid "Set avatar"
@@ -196,7 +196,7 @@ msgstr "设置头像"
 
 #: static/misago/js/misago.js:1
 msgid "Crop image"
-msgstr "修剪头像"
+msgstr "裁剪图像"
 
 #: static/misago/js/misago.js:2
 msgid "Save choice"
@@ -208,15 +208,15 @@ msgstr "选择头像"
 
 #: static/misago/js/misago.js:2
 msgid "Download my Gravatar"
-msgstr "下载我的Gravatar(中国大陆不可用)"
+msgstr "下载我的Gravatar"
 
 #: static/misago/js/misago.js:2
 msgid "Re-crop uploaded image"
-msgstr "重新上传图片"
+msgstr "重新裁剪图片"
 
 #: static/misago/js/misago.js:2
 msgid "Upload new image"
-msgstr "上传新图片"
+msgstr "上传新头像"
 
 #: static/misago/js/misago.js:2
 msgid "Pick avatar from gallery"
@@ -234,15 +234,15 @@ msgstr "确定"
 
 #: static/misago/js/misago.js:2
 msgid "Change your avatar"
-msgstr "改你的头像"
+msgstr "改你的头像"
 
 #: static/misago/js/misago.js:2
 msgid "Your image has been uploaded and you may now crop it."
-msgstr "你的图像已上传,你现在可以裁剪。"
+msgstr "你的图像已上传,你现在可以裁剪。"
 
 #: static/misago/js/misago.js:2
 msgid "Selected file is too big. (%(filesize)s)"
-msgstr "所选文件太大(%(filesize)s)"
+msgstr "所选文件太大。(%(filesize)s)"
 
 #: static/misago/js/misago.js:2
 msgid "Selected file type is not supported."
@@ -250,7 +250,7 @@ msgstr "不支持所选文件类型。"
 
 #: static/misago/js/misago.js:2
 msgid "%(files)s files smaller than %(limit)s"
-msgstr "%(files)s 文件小于 %(limit)s"
+msgstr "%(files)s文件小于%(limit)s"
 
 #: static/misago/js/misago.js:2
 msgid "Select file"
@@ -258,15 +258,15 @@ msgstr "选择文件"
 
 #: static/misago/js/misago.js:2
 msgid "%(progress)s % complete"
-msgstr "%(progress)s 完成"
+msgstr "%(progress)s % 完成"
 
 #: static/misago/js/misago.js:2
 msgid "No profile details are editable at this time."
-msgstr "前没有可编辑的个人信息。"
+msgstr "前没有可编辑的个人信息。"
 
 #: static/misago/js/misago.js:2
 msgid "This option is currently unavailable."
-msgstr "该选项前不可用。"
+msgstr "该选项前不可用。"
 
 #: static/misago/js/misago.js:2 static/misago/js/misago.js:6
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:13
@@ -278,21 +278,25 @@ msgstr "表单包含错误。"
 #: static/misago/js/misago.js:6 static/misago/js/misago.js:12
 #: static/misago/js/misago.js:15
 msgid "Save changes"
-msgstr "保存改"
+msgstr "保存改"
 
 #: static/misago/js/misago.js:2 static/misago/js/misago.js:5
 msgid "Edit details"
 msgstr "编辑详情"
 
 #: static/misago/js/misago.js:2
+msgid "Insert spoiler"
+msgstr ""
+
+#: static/misago/js/misago.js:2
 msgid "Enter name of syntax of your code (optional)"
-msgstr "输入你的代码的语法名称(可选)"
+msgstr "输入代码语言名称(可选)"
 
 #: static/misago/js/misago.js:2
 msgid "Insert code"
 msgstr "插入代码"
 
-#: static/misago/js/misago.js:2
+#: static/misago/js/misago.js:3
 msgid "Emphase selection"
 msgstr "斜体"
 
@@ -302,7 +306,7 @@ msgstr "插入分割线"
 
 #: static/misago/js/misago.js:3
 msgid "Enter link to image"
-msgstr "输入图链接"
+msgstr "输入图链接"
 
 #: static/misago/js/misago.js:3
 msgid "Enter image label (optional)"
@@ -326,7 +330,7 @@ msgstr "插入链接"
 
 #: static/misago/js/misago.js:3
 msgid "Enter quote autor, prefix usernames with @"
-msgstr "输入报价autor,前缀用户名@"
+msgstr "输入引用作者,在用户名前面加上@"
 
 #: static/misago/js/misago.js:3
 msgid "Insert quote"
@@ -342,7 +346,7 @@ msgstr "粗体"
 
 #: static/misago/js/misago.js:3 static/misago/js/misago.js:9
 msgid "%(filetype)s, %(size)s, uploaded by %(uploader)s %(uploaded_on)s."
-msgstr "%(filetype)s,%(size)s,%(uploader)s 上传于 %(uploaded_on)s。"
+msgstr "%(filetype)s, %(size)s, %(uploader)s 上传于 %(uploaded_on)s."
 
 #: static/misago/js/misago.js:3
 msgid "Insert"
@@ -350,7 +354,7 @@ msgstr "插入"
 
 #: static/misago/js/misago.js:3 static/misago/js/misago.js:6
 msgid "Remove"
-msgstr "去掉"
+msgstr "移除"
 
 #: static/misago/js/misago.js:3
 msgid "Undo removal"
@@ -358,11 +362,11 @@ msgstr "撤消删除"
 
 #: static/misago/js/misago.js:3
 msgid "Error uploading %(filename)s"
-msgstr "上传错误 %(filename)s"
+msgstr "上传 %(filename)s 时发生错误"
 
 #: static/misago/js/misago.js:3 static/misago/js/misago.js:9
 msgid "Dismiss"
-msgstr "移除"
+msgstr "不再显示"
 
 #: static/misago/js/misago.js:3
 msgid "Uploading %(filename)s... %(progress)s"
@@ -374,12 +378,12 @@ msgstr "上传文件"
 
 #: static/misago/js/misago.js:3
 msgid "Protected"
-msgstr "受保护"
+msgstr "已锁定"
 
 #: static/misago/js/misago.js:3 static/misago/js/misago.js:10
 #: static/misago/js/misago.js:16
 msgid "Protect"
-msgstr "保护"
+msgstr "锁定"
 
 #: static/misago/js/misago.js:3
 msgid "Preview"
@@ -391,7 +395,7 @@ msgstr "发布"
 
 #: static/misago/js/misago.js:3
 msgid "Preview message"
-msgstr "预览息"
+msgstr "预览息"
 
 #: static/misago/js/misago.js:3
 msgid "(error)"
@@ -401,7 +405,7 @@ msgstr "(错误)"
 msgid "(success)"
 msgstr "(成功)"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:10
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:11
 #: static/misago/js/misago.js:17
 msgid "Best answer"
 msgstr "最佳答案"
@@ -433,7 +437,7 @@ msgstr "合并话题"
 
 #: static/misago/js/misago.js:4
 msgid "Search returned no results."
-msgstr "没有找到任何结果。"
+msgstr "什么也没有找到。"
 
 #: static/misago/js/misago.js:4 static/misago/js/misago.js:14
 msgid "Search"
@@ -442,7 +446,7 @@ msgstr "搜索"
 #: static/misago/js/misago.js:4
 msgid "See full \"%(provider)s\" results page with %(count)s result."
 msgid_plural "See full \"%(provider)s\" results page with %(count)s results."
-msgstr[0] "在结果页面查看完整的 “%(provider)s”, 共 %(count)s 条结果。"
+msgstr[0] "在结果页面查看完整的 \"%(provider)s\" , 共 %(count)s 条结果。"
 
 #: static/misago/js/misago.js:4
 msgid "Posted by %(poster)s on %(posted_on)s in %(category)s."
@@ -452,21 +456,22 @@ msgstr "由 %(poster)s 在 %(posted_on)s 发布于 %(category)s 板块中。"
 msgid "%(title)s, joined on %(joined_on)s"
 msgstr "%(title)s,加入于 %(joined_on)s"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:13
+#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
+#: static/misago/js/misago.js:13
 msgid "Change username"
-msgstr "改用户名"
+msgstr "改用户名"
 
 #: static/misago/js/misago.js:4
 msgid "You will be able to change your username %(next_change)s."
-msgstr "%(next_change)s 天之后,你可以再次更改用户名。"
+msgstr "你可以在 %(next_change)s 修改你的用户名。"
 
 #: static/misago/js/misago.js:4
 msgid "You have used up available name changes."
-msgstr "你已经使用可用的名称更改。"
+msgstr "你已经用完了可修改次数。"
 
 #: static/misago/js/misago.js:4
 msgid "You can't change your username at the moment."
-msgstr "你前无法更改用户名。"
+msgstr "你前无法更改用户名。"
 
 #: static/misago/js/misago.js:4
 msgid "You can change your username %(changes_left)s more time."
@@ -487,40 +492,39 @@ msgstr "你的新用户名与当前用户名相同。"
 msgid "New username"
 msgstr "新用户名"
 
-#: static/misago/js/misago.js:4
+#: static/misago/js/misago.js:5
 msgid "Your username has been changed successfully."
-msgstr "你的用户名已成功更改。"
+msgstr "你的用户名已修改成功。"
 
-#: static/misago/js/misago.js:4 static/misago/js/misago.js:5
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change your options"
 msgstr "更改你的选项"
 
 #: static/misago/js/misago.js:5
 msgid "Enter your password to confirm account deletion."
-msgstr "输入你的密码以确认删除你的账户。"
+msgstr "删除账户需要校验你的密码。"
 
 #: static/misago/js/misago.js:5 static/misago/js/misago.js:13
 msgid "Delete account"
-msgstr "删除帐"
+msgstr "删除帐"
 
 #: static/misago/js/misago.js:5
 msgid ""
 "You are going to delete your account. This action is nonreversible, and will"
 " result in following data being deleted:"
-msgstr "你将要删除你的帐户。此操作是不可逆的,并且会导致以下数据被删除:"
+msgstr "你正准备删除你的账户,此操作是不可逆的,请再考虑一下!如果你执意要删除账户,我必须提醒你,如下数据将被删除:"
 
 #: static/misago/js/misago.js:5
 msgid ""
 "Stored IP addresses associated with content that you have posted will be "
 "deleted."
-msgstr "与你发布的内容相关联的IP地址记录将被删除。"
+msgstr "与你发布的内容相关联的 IP 地址记录将被删除。"
 
 #: static/misago/js/misago.js:5
 msgid ""
 "Your username will become available for other user to rename to or for new "
 "user to register their account with."
-msgstr "你的用户名将可供其他用户重新命名,或供新用户注册其帐户。"
+msgstr "你的用户名将开放给所有用户。"
 
 #: static/misago/js/misago.js:5
 msgid "Your e-mail will become available for use in new account registration."
@@ -534,7 +538,7 @@ msgstr "你发布的所有内容都不会被删除,但与其关联的用户名
 
 #: static/misago/js/misago.js:5
 msgid "Delete my account"
-msgstr "删除我的户"
+msgstr "删除我的户"
 
 #: static/misago/js/misago.js:5
 msgid "Your request for data download has been registered."
@@ -552,7 +556,7 @@ msgid ""
 "your download to be prepared. An e-mail with notification will be sent to "
 "you when your data is ready to be downloaded."
 msgstr ""
-"要从网站下载数据, 请单击 “请求数据下载” 按钮。根据要存档的数据量以及希望在同一时间下载数据的用户数, "
+"要从网站下载数据, 请单击 \"请求数据下载\" 按钮。根据要存档的数据量以及希望在同一时间下载数据的用户数, "
 "你的下载准备就绪可能需要几天时间。当你的数据准备好下载时, 将向你发送带有通知的电子邮件。"
 
 #: static/misago/js/misago.js:5
@@ -587,7 +591,7 @@ msgstr "下载已过期"
 
 #: static/misago/js/misago.js:5 static/misago/js/misago.js:12
 msgid "Your details have been updated."
-msgstr "你的信息已更新。"
+msgstr "你的资料已更新。"
 
 #: static/misago/js/misago.js:5
 msgid "Everybody"
@@ -599,7 +603,7 @@ msgstr "我关注的用户"
 
 #: static/misago/js/misago.js:5
 msgid "Nobody"
-msgstr "没有人"
+msgstr "不接受"
 
 #: static/misago/js/misago.js:5 static/misago/js/misago.js:10
 #: static/misago/js/misago.js:16 static/misago/js/misago.js:19
@@ -608,11 +612,11 @@ msgstr "否"
 
 #: static/misago/js/misago.js:5
 msgid "Notify"
-msgstr "通知"
+msgstr "站点通知"
 
 #: static/misago/js/misago.js:5
 msgid "Notify with e-mail"
-msgstr "通过电子邮件通知"
+msgstr "电子邮件通知"
 
 #: static/misago/js/misago.js:5
 msgid "Your forum options have been changed."
@@ -620,7 +624,7 @@ msgstr "你的论坛选项已更改。"
 
 #: static/misago/js/misago.js:5
 msgid "Please reload page and try again."
-msgstr "请重新加载页面,然后重试。"
+msgstr "请重新加载页面,重试。"
 
 #: static/misago/js/misago.js:5
 msgid "Forum options"
@@ -646,11 +650,11 @@ msgstr "如果你隐身,只有有权限的查看隐身用户的用户才可以
 
 #: static/misago/js/misago.js:5
 msgid "Hide my presence from other users"
-msgstr "对于其他用户隐藏我的存在"
+msgstr "隐身"
 
 #: static/misago/js/misago.js:5
 msgid "Show my presence to other users"
-msgstr "向其他用户显示我的存在"
+msgstr "在线"
 
 #: static/misago/js/misago.js:5
 msgid "Private thread invitations"
@@ -670,13 +674,13 @@ msgstr "我回复的话题"
 
 #: static/misago/js/misago.js:5 static/misago/js/misago.js:6
 msgid "Change email or password"
-msgstr "改电子邮件或密码"
+msgstr "改电子邮件或密码"
 
 #: static/misago/js/misago.js:5
 msgid ""
 "You need to set a password for your account to be able to change your "
 "username or email."
-msgstr "你需要为你的帐户设置密码才能更改你的用户名或电子邮件地址。"
+msgstr "你必须设置一个密码才能修改你的用户名或电子邮件地址。"
 
 #: static/misago/js/misago.js:5
 msgid "Set password"
@@ -688,7 +692,7 @@ msgstr "填写所有字段。"
 
 #: static/misago/js/misago.js:5
 msgid "Change e-mail address"
-msgstr "改电子邮件地址"
+msgstr "改电子邮件地址"
 
 #: static/misago/js/misago.js:5
 msgid "New e-mail"
@@ -704,11 +708,11 @@ msgstr "更改电子邮件"
 
 #: static/misago/js/misago.js:5
 msgid "New passwords are different."
-msgstr "新密码是不同的。"
+msgstr "请确保两次输入的密码是一致。"
 
 #: static/misago/js/misago.js:5 static/misago/js/misago.js:14
 msgid "Change password"
-msgstr "改密码"
+msgstr "改密码"
 
 #: static/misago/js/misago.js:5
 msgid "New password"
@@ -728,11 +732,11 @@ msgstr "你已经离开了这个话题。"
 
 #: static/misago/js/misago.js:6
 msgid "%(user)s has been removed from this thread."
-msgstr "%(user)s 已被从该话题中移除。"
+msgstr "已从话题中移除了 %(user)s 。"
 
 #: static/misago/js/misago.js:6
 msgid "%(user)s has been made new thread owner."
-msgstr "%(user)s 已经成为话题的有者。"
+msgstr "%(user)s 已经成为话题的新拥有者。"
 
 #: static/misago/js/misago.js:6
 msgid "Thread owner"
@@ -760,7 +764,7 @@ msgstr "你确定要离开这个话题吗?"
 
 #: static/misago/js/misago.js:6
 msgid "Are you sure you want to remove %(user)s from this thread?"
-msgstr "你确定要把 %(user)s 从这个话题中移除吗?"
+msgstr "你确定从这个话题中移除 %(user)s 吗?"
 
 #: static/misago/js/misago.js:6
 msgid "Leave thread"
@@ -781,15 +785,15 @@ msgstr "输入的密码很弱。"
 
 #: static/misago/js/misago.js:6
 msgid "Entered password is average."
-msgstr "输入的密码是平均值。"
+msgstr "输入的密码强度可接收。"
 
 #: static/misago/js/misago.js:6
 msgid "Entered password is strong."
-msgstr "输入的密码很。"
+msgstr "输入的密码很安全。"
 
 #: static/misago/js/misago.js:6
 msgid "Entered password is very strong."
-msgstr "输入密码非常强。"
+msgstr "输入的密码非常安全。"
 
 #: static/misago/js/misago.js:6
 msgid "Add choice"
@@ -801,7 +805,7 @@ msgstr "你确定要删除此选项吗?"
 
 #: static/misago/js/misago.js:6
 msgid "Delete this choice"
-msgstr "删除这个选择"
+msgstr "删除此选项"
 
 #: static/misago/js/misago.js:6
 msgid "choice label"
@@ -809,7 +813,7 @@ msgstr "选择标签"
 
 #: static/misago/js/misago.js:6
 msgid "Make voting public"
-msgstr "公开投票"
+msgstr "设为公开投票"
 
 #: static/misago/js/misago.js:6
 msgid ""
@@ -817,15 +821,15 @@ msgid ""
 "showing which users voted for which choices and at which times. This option "
 "can't be changed after poll's creation. Moderators may see voting details "
 "for all polls."
-msgstr "公开投票将允许所有人查看投票详情,将显示哪些用户在哪些时间投票选择了哪些选。这个选项在投票建立后无法更改。版主可以查看所有投票的详情。"
+msgstr "设为公开将允许所有人查看投票详情,将显示哪些用户在哪些时间投票选择了哪些选。这个选项在投票建立后无法更改。版主可以查看所有投票的详情。"
 
 #: static/misago/js/misago.js:6
 msgid "Votes are public"
-msgstr "投票是公开"
+msgstr "公开"
 
 #: static/misago/js/misago.js:6
 msgid "Votes are hidden"
-msgstr "投票被隐藏"
+msgstr "隐藏"
 
 #: static/misago/js/misago.js:6
 msgid "Are you sure you want to discard poll?"
@@ -849,7 +853,7 @@ msgstr "投票问题"
 
 #: static/misago/js/misago.js:6
 msgid "Available choices"
-msgstr "可用选项"
+msgstr "可用选项"
 
 #: static/misago/js/misago.js:6
 msgid "Voting"
@@ -871,15 +875,15 @@ msgstr "允许的选项"
 
 #: static/misago/js/misago.js:6
 msgid "Allow vote changes"
-msgstr "允许改投票"
+msgstr "允许改投票"
 
 #: static/misago/js/misago.js:6
 msgid "Allow participants to change their vote"
-msgstr "允许参与者改投票"
+msgstr "允许参与者改投票"
 
 #: static/misago/js/misago.js:6
 msgid "Don't allow participants to change their vote"
-msgstr "不允许参与者改投票"
+msgstr "不允许参与者改投票"
 
 #: static/misago/js/misago.js:6
 msgid "Post poll"
@@ -889,11 +893,11 @@ msgstr "发起投票"
 msgid "Posted by %(poster)s %(posted_on)s."
 msgstr "%(poster)s 发布于 %(posted_on)s。"
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "Voting ends %(ends_on)s."
 msgstr "投票结束于 %(ends_on)s。"
 
-#: static/misago/js/misago.js:6
+#: static/misago/js/misago.js:7
 msgid "%(votes)s vote."
 msgid_plural "%(votes)s votes."
 msgstr[0] "%(votes)s 票。"
@@ -905,7 +909,7 @@ msgstr "投票是公开的。"
 #: static/misago/js/misago.js:7
 msgid "%(votes)s vote, %(proc)s% of total."
 msgid_plural "%(votes)s votes, %(proc)s% of total."
-msgstr[0] "%(votes)s 个投票,占总数的 %(proc)s%。"
+msgstr[0] "%(votes)s 票,占总数的 %(proc)s。"
 
 #: static/misago/js/misago.js:7
 msgid "Your choice."
@@ -914,7 +918,7 @@ msgstr "你的选择。"
 #: static/misago/js/misago.js:7
 msgid "%(votes)s user has voted for this choice."
 msgid_plural "%(votes)s users have voted for this choice."
-msgstr[0] "%(votes)s 个用户投票赞成选择。"
+msgstr[0] "%(votes)s 名用户投了这个选项。"
 
 #: static/misago/js/misago.js:7
 msgid "Poll votes"
@@ -940,12 +944,13 @@ msgstr "你确定要删除此投票吗?该操作是不可逆的。"
 
 #: static/misago/js/misago.js:7 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
+#: static/misago/js/misago.js:17
 msgid "Delete"
 msgstr "删除"
 
 #: static/misago/js/misago.js:7
 msgid "You can't select any more choices."
-msgstr "你不可以再选择任何选项。"
+msgstr "你不可以选择更多选项了。"
 
 #: static/misago/js/misago.js:7
 msgid "You can select %(choices)s more choice."
@@ -958,11 +963,11 @@ msgstr "稍后你可以更改你的投票。"
 
 #: static/misago/js/misago.js:7
 msgid "Votes are final."
-msgstr "投票不更改。"
+msgstr "投票不更改。"
 
 #: static/misago/js/misago.js:7
 msgid "You need to select at least one choice"
-msgstr "你需要至少选择一个选择"
+msgstr "你需要选择至少一个选项"
 
 #: static/misago/js/misago.js:7
 msgid "Your vote has been saved."
@@ -976,11 +981,11 @@ msgstr "保存投票"
 msgid "See results"
 msgstr "查看结果"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert post to state from before this edit."
 msgstr "将帖子恢复成编辑之前的状态。"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "Revert"
 msgstr "还原"
 
@@ -992,27 +997,27 @@ msgstr "帖子编辑历史"
 msgid ""
 "Are you sure you with to revert this post to the state from before this "
 "edit?"
-msgstr "你确定你要还原这个帖子到编辑之前的状态吗?"
+msgstr "你确定还原这个帖子为编辑之前的状态嘛?"
 
 #: static/misago/js/misago.js:7
 msgid "Post has been reverted to previous state."
-msgstr "帖子已被恢复到以前的状态。"
+msgstr "帖子已还原到上一次编辑的状态。"
 
-#: static/misago/js/misago.js:7
+#: static/misago/js/misago.js:7 static/misago/js/misago.js:8
 msgid "See previous change"
-msgstr "看到以前的变化"
+msgstr "查看上一次修改"
 
 #: static/misago/js/misago.js:8
 msgid "By %(edited_by)s %(edited_on)s."
-msgstr "%(edited_by) 于 s%(edited_on)s 编辑。"
+msgstr "%(edited_by)s 编辑于 %(edited_on)s。"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 msgid "This post's contents cannot be displayed."
-msgstr "此帖的内容无法显示。"
+msgstr "无法显示这个帖子的内容。"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 msgid "This error is caused by invalid post content manipulation."
-msgstr "此错误是由不合法的帖子内容操作引起的。"
+msgstr "此错误是由违规的操作引起的。"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:11
 msgid "posted %(posted_on)s"
@@ -1020,7 +1025,7 @@ msgstr "发布于 %(posted_on)s"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:11
 msgid "Removed user"
-msgstr "被移除用户"
+msgstr "已移除的用户"
 
 #: static/misago/js/misago.js:8
 msgid "See post"
@@ -1028,7 +1033,7 @@ msgstr "查看帖子"
 
 #: static/misago/js/misago.js:8
 msgid "Post Likes"
-msgstr "帖子获赞"
+msgstr "帖子获赞"
 
 #: static/misago/js/misago.js:8
 msgid "%(likes)s like"
@@ -1041,11 +1046,11 @@ msgstr "没有用户赞这条帖子。"
 
 #: static/misago/js/misago.js:8
 msgid "Are you sure you want to discard changes?"
-msgstr "你确定要放弃改吗?"
+msgstr "你确定要放弃改吗?"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 msgid "You have to enter a message."
-msgstr "你必须输入消息。"
+msgstr "你必须输入内容。"
 
 #: static/misago/js/misago.js:8
 msgid "Reply has been edited."
@@ -1053,7 +1058,7 @@ msgstr "回复已编辑。"
 
 #: static/misago/js/misago.js:8
 msgid "Edit reply"
-msgstr "编辑回"
+msgstr "编辑回"
 
 #: static/misago/js/misago.js:8
 msgid "Are you sure you want to discard your reply?"
@@ -1073,32 +1078,32 @@ msgstr "你确定要丢弃此隐蔽话题吗?"
 
 #: static/misago/js/misago.js:8
 msgid "You have to enter at least one recipient."
-msgstr "你必须至少输入一个收件人。"
+msgstr "你必须至少输入一个参与者。"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:15
 msgid "You have to enter thread title."
-msgstr "你必须输入话题标题。"
+msgstr "你必须输入话题名称。"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 msgid "Your thread has been posted."
-msgstr "你的话题已发。"
+msgstr "你的话题已发。"
 
 #: static/misago/js/misago.js:8
 msgid "Comma separated list of user names, eg.: Danny, Lisa"
-msgstr "逗号分隔的用户名列表,例如:Danny,Lisa"
+msgstr "使用逗号分隔用户名,例如:Danny,Lisa"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
 #: static/misago/js/misago.js:19
 msgid "Thread title"
-msgstr "话题标题"
+msgstr "话题名称"
 
 #: static/misago/js/misago.js:8 static/misago/js/misago.js:9
 msgid "Post thread"
 msgstr "发起话题"
 
-#: static/misago/js/misago.js:8
+#: static/misago/js/misago.js:9
 msgid "Are you sure you want to discard thread?"
 msgstr "你确定要放弃话题吗?"
 
@@ -1118,7 +1123,7 @@ msgstr "隐藏"
 
 #: static/misago/js/misago.js:9
 msgid "Not hidden"
-msgstr "不隐藏"
+msgstr "显示"
 
 #: static/misago/js/misago.js:9
 msgid "Unpinned"
@@ -1134,7 +1139,7 @@ msgstr "版块内置顶"
 #: static/misago/js/misago.js:15 static/misago/js/misago.js:16
 #: static/misago/js/misago.js:18 static/misago/js/misago.js:19
 msgid "Pinned globally"
-msgstr "全局置顶(于所有版块中置顶)"
+msgstr "全局置顶"
 
 #: static/misago/js/misago.js:9
 msgid ""
@@ -1143,7 +1148,7 @@ msgid ""
 msgid_plural ""
 "Thread title should be at least %(limit_value)s characters long (it has "
 "%(show_value)s)."
-msgstr[0] "话题标题应至少需要 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
+msgstr[0] "话题名称至少需要 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: static/misago/js/misago.js:9
 msgid ""
@@ -1152,7 +1157,7 @@ msgid ""
 msgid_plural ""
 "Thread title cannot be longer than %(limit_value)s characters (it has "
 "%(show_value)s)."
-msgstr[0] "话题标题最多包含 %(limit_value)s 个字符(现有%(show_value)s 个字符)。"
+msgstr[0] "话题名称最多包含 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: static/misago/js/misago.js:9
 msgid ""
@@ -1161,7 +1166,7 @@ msgid ""
 msgid_plural ""
 "Posted message should be at least %(limit_value)s characters long (it has "
 "%(show_value)s)."
-msgstr[0] "发帖内容至少 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
+msgstr[0] "发帖内容至少需要 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: static/misago/js/misago.js:9
 msgid ""
@@ -1170,10 +1175,10 @@ msgid ""
 msgid_plural ""
 "Posted message cannot be longer than %(limit_value)s characters (it has "
 "%(show_value)s)."
-msgstr[0] "发帖内容最多包含 %(limit_value)s 个字符(现有%(show_value)s 个字符)。"
+msgstr[0] "发帖内容最多包含 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:10
-#: static/misago/js/misago.js:16
+#: static/misago/js/misago.js:16 static/misago/js/misago.js:17
 msgid "Hide"
 msgstr "隐藏"
 
@@ -1193,7 +1198,7 @@ msgstr "事件已被删除。"
 
 #: static/misago/js/misago.js:9
 msgid "Hidden by %(event_by)s %(event_on)s."
-msgstr "%(event_by)s 于 %(event_on)s 隐藏。"
+msgstr "%(event_by)s 隐藏于 %(event_on)s。"
 
 #: static/misago/js/misago.js:9
 msgid "By %(event_by)s %(event_on)s."
@@ -1201,19 +1206,19 @@ msgstr "%(event_by)s 于 %(event_on)s。"
 
 #: static/misago/js/misago.js:9
 msgid "Thread title has been changed from %(old_title)s."
-msgstr "话题标题已从 %(old_title)s 更改。"
+msgstr "话题名称已从 %(old_title)s 更改。"
 
 #: static/misago/js/misago.js:9
 msgid "Thread has been moved from %(from_category)s."
-msgstr "话题已从 %(from_category)s 中移出。"
+msgstr "话题已从 %(from_category)s 中移出。"
 
 #: static/misago/js/misago.js:9
 msgid "The %(merged_thread)s thread has been merged into this thread."
-msgstr "%(merged_thread)s 话题已合并到此话题中。"
+msgstr "%(merged_thread)s 话题已合并到此话题中。"
 
 #: static/misago/js/misago.js:9
 msgid "Changed thread owner to %(user)s."
-msgstr "将话题所有者更改为 %(user)s。"
+msgstr "变更话题所有者为 %(user)s。"
 
 #: static/misago/js/misago.js:9
 msgid "Added %(user)s to thread."
@@ -1221,7 +1226,7 @@ msgstr "已添加 %(user)s 到话题。"
 
 #: static/misago/js/misago.js:9
 msgid "Removed %(user)s from thread."
-msgstr "已从话题除 %(user)s。"
+msgstr "已从话题除 %(user)s。"
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:16
 msgid "Thread has been pinned globally."
@@ -1229,7 +1234,7 @@ msgstr "话题已在全局置顶。"
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:16
 msgid "Thread has been pinned locally."
-msgstr "话题已在版块内置顶。"
+msgstr "话题已在版块内置顶。"
 
 #: static/misago/js/misago.js:9 static/misago/js/misago.js:16
 msgid "Thread has been unpinned."
@@ -1261,7 +1266,7 @@ msgstr "接管话题。"
 
 #: static/misago/js/misago.js:9
 msgid "Owner has left thread. This thread is now closed."
-msgstr "所有者已离开。此话题现已关闭。"
+msgstr "所有者已离开话题。此话题现已关闭。"
 
 #: static/misago/js/misago.js:9
 msgid "Participant has left thread."
@@ -1273,24 +1278,24 @@ msgstr "新事件"
 
 #: static/misago/js/misago.js:9
 msgid "Hidden by %(hidden_by)s %(hidden_on)s."
-msgstr "%(hidden_by)s 于 %(hidden_on)s 隐藏。"
+msgstr "%(hidden_by)s 隐藏于 %(hidden_on)s。"
 
 #: static/misago/js/misago.js:9
 msgid "This post is hidden. You cannot see its contents."
-msgstr "这个帖子是隐藏的。你看不到它的内容。"
+msgstr "这个帖子已被隐藏。你无法查看内容。"
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid ""
 "Are you sure you want to delete this post? This action is not reversible!"
 msgstr "你确定要删除这个帖子?这个操作是不可逆的!"
 
-#: static/misago/js/misago.js:9
+#: static/misago/js/misago.js:10
 msgid "Post has been deleted."
 msgstr "帖子已被删除。"
 
 #: static/misago/js/misago.js:10
 msgid "Permament link to this post:"
-msgstr "该帖的永久链接:"
+msgstr "帖子永久链接:"
 
 #: static/misago/js/misago.js:10
 msgid "Permament link"
@@ -1311,7 +1316,7 @@ msgstr[0] "此帖子被编辑了 %(edits)s 次。"
 
 #: static/misago/js/misago.js:10
 msgid "Changes history"
-msgstr "改历史"
+msgstr "改历史"
 
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
 msgid "Approve"
@@ -1323,11 +1328,11 @@ msgstr "移动"
 
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
 msgid "Split"
-msgstr "分"
+msgstr "分"
 
 #: static/misago/js/misago.js:10
 msgid "Remove protection"
-msgstr "去除保护"
+msgstr "移除锁定"
 
 #: static/misago/js/misago.js:10
 msgid "Move post"
@@ -1340,11 +1345,11 @@ msgstr "你必须输入到另一个话题的链接。"
 
 #: static/misago/js/misago.js:10
 msgid "Selected post was moved to the other thread."
-msgstr "选定的帖子移动到另一个话题。"
+msgstr "选定的帖子移动到另一个话题。"
 
 #: static/misago/js/misago.js:10
 msgid "Link to thread you want to move post to"
-msgstr "链接到你要移动的话题"
+msgstr "你希望将帖子移动到的话题链接"
 
 #: static/misago/js/misago.js:10
 msgid "You can't move this post at the moment."
@@ -1361,12 +1366,12 @@ msgstr "是"
 
 #: static/misago/js/misago.js:10
 msgid "Selected post was split into new thread."
-msgstr "选定的帖子被分成新的话题。"
+msgstr "选定的帖子将成为新话题。"
 
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
 #: static/misago/js/misago.js:19
 msgid "Not pinned"
-msgstr "没有置顶"
+msgstr "置顶"
 
 #: static/misago/js/misago.js:10 static/misago/js/misago.js:16
 #: static/misago/js/misago.js:19
@@ -1394,25 +1399,25 @@ msgstr "拆分帖子"
 
 #: static/misago/js/misago.js:10
 msgid "Marked as best answer by you %(marked_on)s."
-msgstr "你于 %(marked_on)s 将该贴标记为最佳答案。"
+msgstr "你已在 %(marked_on)s 将此贴设为最佳答案。"
 
 #: static/misago/js/misago.js:10
 msgid "Marked as best answer by %(marked_by)s %(marked_on)s."
-msgstr "%(marked_by)s 在 %(marked_on)s 将此贴设为最佳答案。"
+msgstr "%(marked_by)s 在 %(marked_on)s 将此贴设为最佳答案。"
 
 #: static/misago/js/misago.js:10
 msgid "This post is hidden. Only users with permission may see its contents."
-msgstr "这个帖子是隐藏的。只有拥有权限的用户才可以看到其内容。"
+msgstr "这个帖子是隐藏的。只有拥有相关权限的用户才可以看到其内容。"
 
 #: static/misago/js/misago.js:10
 msgid ""
 "This post is unapproved. Only users with permission to approve posts and its"
 " author may see its contents."
-msgstr "此信息未批准。只有拥有审批帖子权限的用户及作者可以看到它的内容。"
+msgstr "此帖子未批准。只有拥有审批帖子权限的用户及作者可以看到它的内容。"
 
 #: static/misago/js/misago.js:10
 msgid "This post is protected. Only moderators may change it."
-msgstr "此帖被保护。只有版主可以更改它。"
+msgstr "此贴已锁定,只有版主可修改。"
 
 #: static/misago/js/misago.js:10
 msgid "%(user)s likes this."
@@ -1433,7 +1438,7 @@ msgstr[0] "%(users)s 和其他 %(likes)s 个用户赞了。"
 
 #: static/misago/js/misago.js:11
 msgid "Liked"
-msgstr "赞"
+msgstr "赞"
 
 #: static/misago/js/misago.js:11
 msgid "Like"
@@ -1454,11 +1459,11 @@ msgstr "最新"
 
 #: static/misago/js/misago.js:11
 msgid "This post is protected and may not be edited."
-msgstr "这篇文章是受保护的,不可以被编辑。"
+msgstr "这条帖子已锁定,无法再次编辑。"
 
 #: static/misago/js/misago.js:11
 msgid "protected"
-msgstr "受保护"
+msgstr "已锁定"
 
 #: static/misago/js/misago.js:11
 msgid "edited %(edits)s time"
@@ -1480,15 +1485,15 @@ msgstr "显示给用户的封禁信息"
 
 #: static/misago/js/misago.js:11
 msgid "Team-shown ban message"
-msgstr "显示给论坛管理团队的封禁讯息"
+msgstr "显示给管理团队的封禁讯息"
 
 #: static/misago/js/misago.js:11
 msgid "%(username)s's ban is permanent."
-msgstr "%(username)s 的封禁是永久性的。"
+msgstr "%(username)s 已永久封禁。"
 
 #: static/misago/js/misago.js:11
 msgid "Ban expiration"
-msgstr "封禁期"
+msgstr "封禁期"
 
 #: static/misago/js/misago.js:11
 msgid "No ban is active at the moment."
@@ -1496,32 +1501,32 @@ msgstr "目前没有封禁。"
 
 #: static/misago/js/misago.js:11
 msgid "You are not sharing any details with others."
-msgstr "你没有与其他用户分享任何详情。"
+msgstr "你没有分享信息给站内成员。"
 
 #: static/misago/js/misago.js:11
 msgid "%(username)s is not sharing any details with others."
-msgstr "%(username)s 没有分享任何信息给其他用户。"
+msgstr "%(username)s 什么也没有分享。"
 
 #: static/misago/js/misago.js:11 static/misago/js/misago.js:12
 msgid "Details"
-msgstr "详"
+msgstr "详细资料"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s's details have been updated."
-msgstr "%(username)s 的信息已更新。"
+msgstr "%(username)s 的资料已更新。"
 
 #: static/misago/js/misago.js:12
 msgid "You have no started threads."
-msgstr "你还没有发起任何话题。"
+msgstr "你还没有发起话题。"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s started no threads."
-msgstr "%(username)s 没有发起话题。"
+msgstr "%(username)s 没有发起话题。"
 
 #: static/misago/js/misago.js:12
 msgid "You have started %(threads)s thread."
 msgid_plural "You have started %(threads)s threads."
-msgstr[0] "你已经发起了 %(threads)s 话题。"
+msgstr[0] "你已经发起了 %(threads)s 话题。"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s has started %(threads)s thread."
@@ -1539,25 +1544,25 @@ msgstr "话题"
 
 #: static/misago/js/misago.js:12
 msgid "You have posted no messages."
-msgstr "你没有发布过任何消息。"
+msgstr "你还没有发布信息。"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s posted no messages."
-msgstr "%(username)s 没有留言。"
+msgstr "%(username)s 还没有发布信息。"
 
 #: static/misago/js/misago.js:12
 msgid "You have posted %(posts)s message."
 msgid_plural "You have posted %(posts)s messages."
-msgstr[0] "你已经发布了 %(posts)s 条消息。"
+msgstr[0] "你发布了 %(posts)s 条信息。"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s has posted %(posts)s message."
 msgid_plural "%(username)s has posted %(posts)s messages."
-msgstr[0] "%(username)s 已发布 %(posts)s 条消息。"
+msgstr[0] "%(username)s 发布了 %(posts)s 条信息。"
 
 #: static/misago/js/misago.js:12
 msgid "Posts"
-msgstr "帖"
+msgstr "帖"
 
 #: static/misago/js/misago.js:12
 msgid "Show older activity"
@@ -1565,7 +1570,7 @@ msgstr "加载更多"
 
 #: static/misago/js/misago.js:12
 msgid "Following"
-msgstr "关注"
+msgstr "关注"
 
 #: static/misago/js/misago.js:12
 msgid "Follow"
@@ -1592,7 +1597,7 @@ msgstr[0] "%(username)s 有 %(users)s 个关注者。"
 
 #: static/misago/js/misago.js:12
 msgid "Search returned no users matching specified criteria."
-msgstr "搜索没有返回符合指定条件的用户。"
+msgstr "没有找到符合指定条件的用户。"
 
 #: static/misago/js/misago.js:12
 msgid "You have no followers."
@@ -1612,12 +1617,12 @@ msgstr "搜索用户..."
 
 #: static/misago/js/misago.js:12
 msgid "Follows"
-msgstr "正在关注"
+msgstr "关注"
 
 #: static/misago/js/misago.js:12
 msgid "You are following %(users)s user."
 msgid_plural "You are following %(users)s users."
-msgstr[0] "你 关注了 %(users)s 个用户。"
+msgstr[0] "你已关注 %(users)s 个用户。"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s is following %(users)s user."
@@ -1630,7 +1635,7 @@ msgstr "你没有关注任何用户。"
 
 #: static/misago/js/misago.js:12
 msgid "%(username)s is not following any users."
-msgstr "%(username)s 没有关注任何用户。"
+msgstr "%(username)s 没有关注任何用户。"
 
 #: static/misago/js/misago.js:12
 msgid "This user is deleting their account."
@@ -1638,7 +1643,7 @@ msgstr "此用户正在删除其帐号。"
 
 #: static/misago/js/misago.js:12
 msgid "This user's account has been disabled by administrator."
-msgstr "此用户的帐已被管理员禁用。"
+msgstr "此用户的帐已被管理员禁用。"
 
 #: static/misago/js/misago.js:12 static/misago/js/misago.js:21
 msgid "Joined on %(joined_on)s"
@@ -1655,29 +1660,29 @@ msgstr "调整"
 
 #: static/misago/js/misago.js:12
 msgid "Message"
-msgstr "发消息"
+msgstr "息"
 
 #: static/misago/js/misago.js:12
 msgid "Avatar controls have been changed."
-msgstr "头像限制已更改。"
+msgstr "已修改头像控制。"
 
 #: static/misago/js/misago.js:12
 msgid "Lock avatar"
-msgstr "锁头像锁定头像"
+msgstr "锁定头像"
 
 #: static/misago/js/misago.js:12
 msgid ""
 "Locking user avatar will prohibit user from changing his avatar and will "
 "reset his/her avatar to default one."
-msgstr "锁定用户头像将禁止用户改其头像并将其头像重置为默认头像。"
+msgstr "锁定用户头像将禁止用户改其头像并将其头像重置为默认头像。"
 
 #: static/misago/js/misago.js:12
 msgid "Disallow user from changing avatar"
-msgstr "禁止用户改头像"
+msgstr "禁止用户改头像"
 
 #: static/misago/js/misago.js:12
 msgid "Allow user to change avatar"
-msgstr "允许用户改头像"
+msgstr "允许用户改头像"
 
 #: static/misago/js/misago.js:12
 msgid "User message"
@@ -1687,7 +1692,7 @@ msgstr "用户信息"
 msgid ""
 "Optional message for user explaining why he/she is prohibited form changing "
 "avatar."
-msgstr "显示给用户的用于说明其被禁止更改头像的原因的消息。(可选)"
+msgstr "告知用户锁定头像的原因。(可选)"
 
 #: static/misago/js/misago.js:12
 msgid "Staff message"
@@ -1697,11 +1702,11 @@ msgstr "员工消息"
 msgid ""
 "Optional message for forum team members explaining why user is prohibited "
 "form changing avatar."
-msgstr "呈现给论坛管理团队的用于说明禁止用户改变头像的原因的消息。(可选)"
+msgstr "告知管理团队该用户锁定头像的原因。(可选)"
 
 #: static/misago/js/misago.js:12 static/misago/js/misago.js:13
 msgid "Avatar controls"
-msgstr "头像制"
+msgstr "头像制"
 
 #: static/misago/js/misago.js:13
 msgid "Username has been changed."
@@ -1715,7 +1720,7 @@ msgstr "%(username)s 的帐号,话题,帖子等内容均已被删除。"
 #: static/misago/js/misago.js:13
 msgid ""
 "%(username)s's account has been deleted and other content has been hidden."
-msgstr "%(username)s 的帐已被删除,其他内容均已被隐藏。"
+msgstr "%(username)s 的帐已被删除,其他内容均已被隐藏。"
 
 #: static/misago/js/misago.js:13
 msgid "Delete %(username)s"
@@ -1723,7 +1728,7 @@ msgstr "删除 %(username)s"
 
 #: static/misago/js/misago.js:13
 msgid "Please wait... (%(countdown)ss)"
-msgstr "请稍候... (%(countdown)ss)"
+msgstr "请稍后... (%(countdown)ss)"
 
 #: static/misago/js/misago.js:13
 msgid "User content"
@@ -1731,11 +1736,11 @@ msgstr "用户内容"
 
 #: static/misago/js/misago.js:13
 msgid "Delete together with user's account"
-msgstr "与用户的帐一起删除"
+msgstr "与用户的帐一起删除"
 
 #: static/misago/js/misago.js:13
 msgid "Hide after deleting user's account"
-msgstr "删除用户帐后隐藏"
+msgstr "删除用户帐后隐藏"
 
 #: static/misago/js/misago.js:13
 msgid "Return to users list"
@@ -1752,7 +1757,7 @@ msgstr "用户名历史记录"
 #: static/misago/js/misago.js:13
 msgid "Found %(changes)s username change."
 msgid_plural "Found %(changes)s username changes."
-msgstr[0] "找到 %(changes)s 个用户名更改。"
+msgstr[0] "找到了 %(changes)s 次用户名更改。"
 
 #: static/misago/js/misago.js:13
 msgid "Your username was changed %(changes)s time."
@@ -1762,23 +1767,23 @@ msgstr[0] "你的用户名已修改 %(changes)s 次。"
 #: static/misago/js/misago.js:13
 msgid "%(username)s's username was changed %(changes)s time."
 msgid_plural "%(username)s's username was changed %(changes)s times."
-msgstr[0] "%(username)s 的用户名已改 %(changes)s 次。"
+msgstr[0] "%(username)s 的用户名已改 %(changes)s 次。"
 
 #: static/misago/js/misago.js:13
 msgid "Search returned no username changes matching specified criteria."
-msgstr "搜索没有返回符合指定条件的用户名更改。"
+msgstr "没有找到符合搜索条件的用户名修改记录。"
 
 #: static/misago/js/misago.js:13 static/misago/js/misago.js:21
 msgid "No name changes have been recorded for your account."
-msgstr "你的帐户没有记录名称更改。"
+msgstr "你的账户没有修改过用户名。"
 
 #: static/misago/js/misago.js:13
 msgid "%(username)s's username was never changed."
-msgstr "%(username)s 的用户名从未改。"
+msgstr "%(username)s 的用户名从未改。"
 
 #: static/misago/js/misago.js:13
 msgid "Show older (%(more)s)"
-msgstr "显示旧 (%(more)s)"
+msgstr "显示旧 (%(more)s)"
 
 #: static/misago/js/misago.js:13
 msgid "Search history..."
@@ -1790,19 +1795,20 @@ msgstr "搜索..."
 
 #: static/misago/js/misago.js:13
 msgid "New registrations are currently disabled."
-msgstr "新注册目前已被禁用。"
+msgstr "已关闭注册。"
 
 #: static/misago/js/misago.js:13
 msgid "Registration is currently unavailable due to an error."
 msgstr "由于某些错误,目前无法注册。"
 
-#: static/misago/js/misago.js:13 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:13 static/misago/js/misago.js:14
+#: static/misago/js/misago.js:20
 msgid "Register"
 msgstr "注册"
 
 #: static/misago/js/misago.js:14
 msgid "Join with %(site)s"
-msgstr "通过 %(site)s 加入"
+msgstr "使用 %(site)s 登录"
 
 #: static/misago/js/misago.js:14
 msgid "Or create forum account:"
@@ -1829,13 +1835,13 @@ msgstr "注册账号"
 msgid ""
 "%(username)s, your account has been created but you need to activate it "
 "before you will be able to sign in."
-msgstr "%(username)s,你的帐户已创建,但你需要激活它之后才可以登录。"
+msgstr "%(username)s 你好,你的帐号已创建,但你需要激活它之后才可以登录。"
 
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 msgid ""
 "%(username)s, your account has been created but board administrator will "
 "have to activate it before you will be able to sign in."
-msgstr "%(username)s,你的帐户已创建,但必须在管理员激活它之后才可以登录。"
+msgstr "%(username)s 你好,你的帐号已创建,但必须在管理员激活它之后才可以登录。"
 
 #: static/misago/js/misago.js:14
 msgid ""
@@ -1897,7 +1903,7 @@ msgstr "%(username)s,你的密码已修改成功。"
 
 #: static/misago/js/misago.js:14
 msgid "You will have to sign in using new password before continuing."
-msgstr "你必须在继续之前使用新密码登录。"
+msgstr "请使用新密码重新登录。"
 
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:15
 #: static/misago/js/misago.js:20
@@ -1906,7 +1912,7 @@ msgstr "登录"
 
 #: static/misago/js/misago.js:14
 msgid "You have to enter search query."
-msgstr "你必须输入搜索查询内容。"
+msgstr "你必须输入要搜索的内容。"
 
 #: static/misago/js/misago.js:14
 msgid "Search took %(time)s s to complete"
@@ -1914,15 +1920,15 @@ msgstr "搜索用时 %(time)s 秒"
 
 #: static/misago/js/misago.js:14
 msgid "No threads matching search query have been found."
-msgstr "没有找到符合搜索条件的帖子。"
+msgstr "没有找到符合搜索关键字的话题"
 
 #: static/misago/js/misago.js:14
 msgid "Enter at least two characters to search threads."
-msgstr "多输入些内容才能搜索到话题."
+msgstr "试着输入多一些信息搜索话题。"
 
 #: static/misago/js/misago.js:14 static/misago/js/misago.js:20
 msgid "Show more"
-msgstr "展示更多"
+msgstr "加载更多"
 
 #: static/misago/js/misago.js:14
 msgid "No users matching search query have been found."
@@ -1930,11 +1936,11 @@ msgstr "没有找到匹配搜索查询的用户。"
 
 #: static/misago/js/misago.js:14
 msgid "Enter at least two characters to search users."
-msgstr "输入至少两个字符以搜索用户。"
+msgstr "至少输入两个字才能搜索用户。"
 
 #: static/misago/js/misago.js:15
 msgid "Fill out both fields."
-msgstr "填写两个字段。"
+msgstr "填写所需的字段。"
 
 #: static/misago/js/misago.js:15
 msgid "Activate account"
@@ -1968,7 +1974,7 @@ msgstr "注册完成!"
 
 #: static/misago/js/misago.js:15
 msgid "Return to forum index"
-msgstr "返回到论坛首页"
+msgstr "返回首页"
 
 #: static/misago/js/misago.js:15
 msgid "Sign in with %(backend)s"
@@ -1992,7 +1998,7 @@ msgstr "电子邮件地址"
 
 #: static/misago/js/misago.js:15
 msgid "Change title"
-msgstr "改标题"
+msgstr "改标题"
 
 #: static/misago/js/misago.js:15
 msgid "Edit title"
@@ -2001,11 +2007,11 @@ msgstr "编辑标题"
 #: static/misago/js/misago.js:15 static/misago/js/misago.js:17
 #: static/misago/js/misago.js:18 static/misago/js/misago.js:20
 msgid "Unapproved"
-msgstr "未批"
+msgstr "未批"
 
 #: static/misago/js/misago.js:15 static/misago/js/misago.js:18
 msgid "Unapproved posts"
-msgstr "未批的帖子"
+msgstr "未批的帖子"
 
 #: static/misago/js/misago.js:15 static/misago/js/misago.js:18
 msgid "%(replies)s reply"
@@ -2020,13 +2026,13 @@ msgstr "%(user)s 最后回复于 %(date)s"
 msgid ""
 "Are you sure you want to merge selected posts? This action is not "
 "reversible!"
-msgstr "你确定要合并选的帖子吗?这个操作是不可逆的!"
+msgstr "你确定要合并选的帖子吗?这个操作是不可逆的!"
 
-#: static/misago/js/misago.js:15
+#: static/misago/js/misago.js:16
 msgid ""
 "Are you sure you want to delete selected posts? This action is not "
 "reversible!"
-msgstr "你确定要删除所选的帖子吗?这个动作不可逆的!"
+msgstr "你确定要删除选定的帖子吗?这个操作是不可逆的!"
 
 #: static/misago/js/misago.js:16
 msgid "Merge"
@@ -2034,11 +2040,11 @@ msgstr "合并"
 
 #: static/misago/js/misago.js:16
 msgid "Unprotect"
-msgstr "取消保护"
+msgstr "取消锁定"
 
 #: static/misago/js/misago.js:16
 msgid "%(username)s on %(posted_on)s"
-msgstr "(username)s 于 %(posted_on)s"
+msgstr "%(username)s 于 %(posted_on)s"
 
 #: static/misago/js/misago.js:16
 msgid "One or more posts could not be changed:"
@@ -2054,23 +2060,23 @@ msgstr "移动帖子"
 
 #: static/misago/js/misago.js:16
 msgid "Selected posts were moved to the other thread."
-msgstr "选定的帖子被移动到另一个话题。"
+msgstr "选定的帖子已移动到另一个话题中。"
 
 #: static/misago/js/misago.js:16
 msgid "Link to thread you want to move posts to"
-msgstr "链接到你要移动帖子的话题"
+msgstr "你希望移动到的话题链接"
 
 #: static/misago/js/misago.js:16
 msgid "You can't move selected posts at the moment."
-msgstr "你目前无法移动选的帖子。"
+msgstr "你目前无法移动选的帖子。"
 
 #: static/misago/js/misago.js:16
 msgid "Split posts into new thread"
-msgstr "将帖子拆分成新话题"
+msgstr "拆分成新话题"
 
 #: static/misago/js/misago.js:16
 msgid "Selected posts were split into new thread."
-msgstr "选定的帖子拆分为新话题。"
+msgstr "选定的帖子拆分为新话题。"
 
 #: static/misago/js/misago.js:16
 msgid "Split posts"
@@ -2086,15 +2092,15 @@ msgstr "你确定要删除此话题吗?"
 
 #: static/misago/js/misago.js:16
 msgid "Thread has been deleted."
-msgstr "话题已删除。"
+msgstr "话题已删除。"
 
 #: static/misago/js/misago.js:16
 msgid "Pin globally"
-msgstr "全局置顶(于所有版块中置顶)"
+msgstr "全局置顶"
 
 #: static/misago/js/misago.js:16
 msgid "Pin locally"
-msgstr "版块置顶"
+msgstr "版块置顶"
 
 #: static/misago/js/misago.js:16
 msgid "Unpin"
@@ -2110,7 +2116,7 @@ msgstr "话题已经与其他话题合并。"
 
 #: static/misago/js/misago.js:17
 msgid "Link to thread you want to merge with"
-msgstr "链接到你要合并的话题"
+msgstr "你要合并的话题链接"
 
 #: static/misago/js/misago.js:17
 msgid ""
@@ -2124,7 +2130,7 @@ msgstr "移动话题"
 
 #: static/misago/js/misago.js:17
 msgid "You can't move this thread at the moment."
-msgstr "你现在不可以移动这个话题。"
+msgstr "你现在不可以移动这个话题,请稍后再试。"
 
 #: static/misago/js/misago.js:17
 msgid "Thread has been moved."
@@ -2136,28 +2142,28 @@ msgstr "新版块"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:22
 msgid "Go to first page"
-msgstr "转到第一页"
+msgstr "转到第一页"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:22
 msgid "Go to previous page"
-msgstr "转到上一页"
+msgstr "转到上一页"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:22
 msgid "Go to next page"
-msgstr "转到下一页"
+msgstr "转到下一页"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:22
 msgid "Go to last page"
-msgstr "转到最后一页"
+msgstr "转到最后一页"
 
 #: static/misago/js/misago.js:17
 msgid "There is %(more)s more post in this thread."
 msgid_plural "There are %(more)s more posts in this thread."
-msgstr[0] "此话题中还有 %(more)s 帖子。"
+msgstr[0] "此话题中还有 %(more)s 帖子。"
 
 #: static/misago/js/misago.js:17
 msgid "There are no more posts in this thread."
-msgstr "这个话题中没有其他帖子。"
+msgstr "此话题中帖子已全部显示。"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:18
 msgid "Enabled"
@@ -2165,7 +2171,7 @@ msgstr "已启用"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:18
 msgid "Disabled"
-msgstr "未订阅"
+msgstr "已禁用"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:19
 msgid "Unsubscribe"
@@ -2177,23 +2183,23 @@ msgstr "订阅"
 
 #: static/misago/js/misago.js:17 static/misago/js/misago.js:19
 msgid "Subscribe with e-mail"
-msgstr "订阅电子邮件"
+msgstr "邮件订阅"
 
 #: static/misago/js/misago.js:17
 msgid "Go to first new post"
-msgstr "转到第一个新帖"
+msgstr "跳转到第一条新帖子"
 
 #: static/misago/js/misago.js:17
 msgid "Go to best answer"
-msgstr "转到最佳答案"
+msgstr "转到最佳答案"
 
 #: static/misago/js/misago.js:17
 msgid "Go to first unapproved post"
-msgstr "转到第一个未批准的帖子"
+msgstr "跳转到第一条未审批的帖子"
 
 #: static/misago/js/misago.js:17
 msgid "Go to last post"
-msgstr "最后一个帖子"
+msgstr "跳转到最后一个帖子"
 
 #: static/misago/js/misago.js:17
 msgid "Last"
@@ -2237,23 +2243,23 @@ msgstr "发起话题"
 
 #: static/misago/js/misago.js:19
 msgid "Why not start one yourself?"
-msgstr "为什么不自己发起一个?"
+msgstr "为什么不发起一个?"
 
 #: static/misago/js/misago.js:19
 msgid "There are no threads on this forum... yet!"
-msgstr "在这个论坛上没有话题...目前!"
+msgstr "难以置信,这个站点上目前居然没有话题...!"
 
 #: static/misago/js/misago.js:19
 msgid "There are no threads in this category."
-msgstr "这个版块里面没有话题。"
+msgstr "此版块中没有话题。"
 
 #: static/misago/js/misago.js:19
 msgid "No threads matching specified criteria were found."
-msgstr "没有找到符合指定标准的话题。"
+msgstr "没有找到符合标准的话题。"
 
 #: static/misago/js/misago.js:19
 msgid "Selected threads were pinned globally."
-msgstr "所选话题全局置顶。"
+msgstr "所选话题已在全局置顶。"
 
 #: static/misago/js/misago.js:19
 msgid "Selected threads were pinned locally."
@@ -2277,7 +2283,7 @@ msgstr "所选话题已关闭。"
 
 #: static/misago/js/misago.js:19
 msgid "Selected threads were unhidden."
-msgstr "所选话题已取消隐藏。"
+msgstr "所选话题已显示。"
 
 #: static/misago/js/misago.js:19
 msgid "Selected threads were hidden."
@@ -2325,11 +2331,11 @@ msgstr "开放话题"
 
 #: static/misago/js/misago.js:19
 msgid "Close threads"
-msgstr "锁定话题"
+msgstr "关闭话题"
 
 #: static/misago/js/misago.js:19
 msgid "Unhide threads"
-msgstr "取消隐藏话题"
+msgstr "显示话题"
 
 #: static/misago/js/misago.js:19
 msgid "Hide threads"
@@ -2341,23 +2347,23 @@ msgstr "删除话题"
 
 #: static/misago/js/misago.js:19
 msgid "Threads moderation"
-msgstr "话题审查"
+msgstr "审核话题"
 
 #: static/misago/js/misago.js:19
 msgid "One or more threads could not be deleted:"
 msgstr "一条或多条话题无法删除:"
 
-#: static/misago/js/misago.js:19 static/misago/js/misago.js:20
+#: static/misago/js/misago.js:20
 msgid ""
 "You can't move threads because there are no categories you are allowed to "
 "move them to."
-msgstr "你不可以移动话题,因为没有允许你移动到的版块。"
+msgstr "你不可以移动话题,因为没有接收你移动话题的版块。"
 
-#: static/misago/js/misago.js:19
+#: static/misago/js/misago.js:20
 msgid ""
 "You need permission to start threads in category to be able to merge threads"
 " to it."
-msgstr "你必须有权限在版块中发启话题,才可以向相应版块合并话题,。"
+msgstr "你必须有权限在版块中发起话题,才可以向相应版块中合并话题。"
 
 #: static/misago/js/misago.js:20
 msgid "Selected threads were moved."
@@ -2367,7 +2373,7 @@ msgstr "所选话题已移动。"
 msgid ""
 "You need permission to start threads in category to be able to move threads "
 "to it."
-msgstr "你必须有权限在次版块中开启话题,才可以移动话题到相应版块,。"
+msgstr "你必须有权限在版块中发起话题,才可以移动话题到相应版块。"
 
 #: static/misago/js/misago.js:20
 msgid "Select all"
@@ -2415,7 +2421,7 @@ msgstr "订阅话题"
 
 #: static/misago/js/misago.js:20
 msgid "Unapproved content"
-msgstr "未批的内容"
+msgstr "未批的内容"
 
 #: static/misago/js/misago.js:20
 msgid "You are browsing as guest."
@@ -2425,30 +2431,29 @@ msgstr "你正以访客身份浏览。"
 msgid "Sign in or register to start and participate in discussions."
 msgstr "登录或注册来发起或参与讨论。"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "You have unread private threads!"
 msgstr "你有未读的隐蔽话题!"
 
-#: static/misago/js/misago.js:20 static/misago/js/misago.js:21
-#: static/misago/js/misago.js:23
+#: static/misago/js/misago.js:21 static/misago/js/misago.js:23
 msgid "Private threads"
 msgstr "隐蔽话题"
 
-#: static/misago/js/misago.js:20
+#: static/misago/js/misago.js:21
 msgid "Are you sure you want to sign out?"
 msgstr "你确定要退出吗?"
 
 #: static/misago/js/misago.js:21
 msgid "See your profile"
-msgstr "个人档案"
+msgstr "查看个人资料"
 
 #: static/misago/js/misago.js:21
 msgid "Change options"
-msgstr "更改设置"
+msgstr "账号设置"
 
 #: static/misago/js/misago.js:21
 msgid "Change avatar"
-msgstr "改头像"
+msgstr "改头像"
 
 #: static/misago/js/misago.js:21
 msgid "Log out"
@@ -2456,7 +2461,7 @@ msgstr "退出"
 
 #: static/misago/js/misago.js:21
 msgid "%(username)s is banned until %(ban_expires)s"
-msgstr "%(username)s 已被封禁到 %(ban_expires)s"
+msgstr "%(username)s 已被封禁到 %(ban_expires)s"
 
 #: static/misago/js/misago.js:21
 msgid "%(username)s is banned"
@@ -2484,7 +2489,7 @@ msgstr "%(username)s 最后一次上线于 %(last_click)s"
 
 #: static/misago/js/misago.js:21
 msgid "Banned"
-msgstr "封禁"
+msgstr "封禁"
 
 #: static/misago/js/misago.js:21
 msgid "Online (hidden)"
@@ -2511,13 +2516,13 @@ msgstr[0] "%(followers)s 个关注者"
 msgid "No users have posted any new messages during last %(days)s days."
 msgstr "最近 %(days)s 天没有用户发布新的帖子。"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Rank"
 msgstr "级别"
 
-#: static/misago/js/misago.js:21 static/misago/js/misago.js:22
+#: static/misago/js/misago.js:22
 msgid "Ranked posts"
-msgstr "级别帖子"
+msgstr "级别帖子"
 
 #: static/misago/js/misago.js:22
 msgid "Total posts"
@@ -2535,11 +2540,11 @@ msgstr "用户"
 #: static/misago/js/misago.js:22
 msgid "There is %(more)s more member with this role."
 msgid_plural "There are %(more)s more members with this role."
-msgstr[0] "该身份新增了 %(more)s 个成员。"
+msgstr[0] "还有 %(more)s 名拥有此权限的用户"
 
 #: static/misago/js/misago.js:22
 msgid "There are no more members with this role."
-msgstr "已无拥有该身份的成员。"
+msgstr "所有拥有此身份的用户已加载完毕。"
 
 #: static/misago/js/misago.js:22
 msgid "There are no users with this rank at the moment."
@@ -2551,13 +2556,13 @@ msgstr "是"
 
 #: static/misago/js/misago.js:22
 msgid "no"
-msgstr "没有"
+msgstr ""
 
 #: static/misago/js/misago.js:23
 msgid ""
 "Private threads are threads which only those that started them and those "
 "they have invited may see and participate in."
-msgstr "隐蔽话题只有那些创建和被邀请的人可以浏览和参与。"
+msgstr "仅发起者和被邀请者可以查看和参与隐蔽话题。"
 
 #: static/misago/js/misago.js:23
 msgid "You aren't participating in any private threads."
@@ -2577,7 +2582,7 @@ msgstr "发生未知错误。"
 
 #: static/misago/js/misago.js:24
 msgid "Upload was rejected by server as too large."
-msgstr "上传因为过大被服务器拒绝。"
+msgstr "文件过大而被服务器拒绝。"
 
 #: static/misago/js/misago.js:24
 msgid "Failed to load CAPTCHA."
@@ -2585,11 +2590,11 @@ msgstr "无法加载验证码。"
 
 #: static/misago/js/misago.js:24
 msgid "Please solve the quick test"
-msgstr "请完成人机测试"
+msgstr "请完成验证"
 
 #: static/misago/js/misago.js:24
 msgid "This test helps us prevent automated spam registrations on our site."
-msgstr "此检测帮助本站预防自动化的批量垃圾注册。"
+msgstr "此验证主要用于预防注册木马。"
 
 #: static/misago/js/misago.js:24
 msgid "page: %(page)s"
@@ -2597,15 +2602,15 @@ msgstr "页:%(page)s"
 
 #: static/misago/js/misago.js:24
 msgid "You are already working on other message. Do you want to discard it?"
-msgstr "你已经在处理其他消息。要放弃吗?"
+msgstr "你已经在处理其他消息。确定要放弃吗?"
 
 #: static/misago/js/misago.js:24
 msgid "You are already working on a poll. Do you want to discard it?"
 msgstr "你已经在编辑投票。确定要放弃吗?"
 
-#: static/misago/js/misago.js:24
+#: static/misago/js/misago.js:25
 msgid "You don't have permission to perform this action."
-msgstr "你没有执行此操作的权限。"
+msgstr "你无权执行此操作。"
 
 #: static/misago/js/misago.js:25
 msgid "You are banned"
@@ -2613,7 +2618,7 @@ msgstr "你被封禁了"
 
 #: static/misago/js/misago.js:25
 msgid "This field is required."
-msgstr "这是必填栏。"
+msgstr "必填项。"
 
 #: static/misago/js/misago.js:25
 msgid "You have to accept the terms of service."
@@ -2630,7 +2635,7 @@ msgid ""
 msgid_plural ""
 "Ensure this value has at least %(limit_value)s characters (it has "
 "%(show_value)s)."
-msgstr[0] "确保此值至少有 %(limit_value)s 个字符(现有%(show_value)s)。"
+msgstr[0] "至少需要有 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: static/misago/js/misago.js:25
 msgid ""
@@ -2639,12 +2644,12 @@ msgid ""
 msgid_plural ""
 "Ensure this value has at most %(limit_value)s characters (it has "
 "%(show_value)s)."
-msgstr[0] "确保此值最多包含 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
+msgstr[0] "最多包含 %(limit_value)s 个字符(现有 %(show_value)s 个字符)。"
 
 #: static/misago/js/misago.js:25
 msgid "Username must be at least %(limit_value)s character long."
 msgid_plural "Username must be at least %(limit_value)s characters long."
-msgstr[0] "用户名少需要 %(limit_value)s 个字符。"
+msgstr[0] "用户名少需要 %(limit_value)s 个字符。"
 
 #: static/misago/js/misago.js:25
 msgid "Username cannot be longer than %(limit_value)s character."