From 38d5c2cab1b0296f7b2e9e305038fc509f2983e5 Mon Sep 17 00:00:00 2001
From: zhaospei <dungbuit1k28@gmail.com>
Date: Sun, 5 Feb 2023 20:13:12 +0700
Subject: [PATCH 1/3] show actionbar pre-expand-blog

---
 resources/blog.scss                 | 30 ++++++----
 templates/actionbar/list.html       | 91 +++++++++++++++--------------
 templates/blog/content.html         | 33 ++++++-----
 templates/three-column-content.html | 13 ++---
 4 files changed, 89 insertions(+), 78 deletions(-)

diff --git a/resources/blog.scss b/resources/blog.scss
index 13a60eb..4f95d00 100644
--- a/resources/blog.scss
+++ b/resources/blog.scss
@@ -222,20 +222,26 @@
     padding-bottom: 0;
 }
 
-.pre-expand-blog::before {
+.show-more {
+    color: var(--color-accent-dark);
+    font-style: italic;
+    font-size: 16px;
+    font-weight: 700;
+    padding: 0px 12px;
+    margin-top: 5px;
     position: absolute;
-    z-index: 1;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    content: "";
-    background-image: -webkit-linear-gradient(bottom, gray, lightgray 3%, transparent 8%, transparent 100%);
-    border-radius: 8px;
+    inset: 50% 0px 60px;
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0) 1%, #f3f3f3 95%, #f3f3f3 100%);
+    display: flex;
+    -webkit-box-pack: end;
+    justify-content: flex-end;
+    align-items: flex-end;
+    cursor: pointer;
+    padding: 16px 16px;
 }
 
-.pre-expand-blog:hover {
-    background-color: #f3f3f3;
+.actionbar-box {
+    margin: 8px 16px;
 }
 
 .post-full {
@@ -349,4 +355,4 @@
             font-size: 2.5em;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html
index 24d07dc..e5761bb 100644
--- a/templates/actionbar/list.html
+++ b/templates/actionbar/list.html
@@ -1,51 +1,54 @@
 {% set logged_in = request.user.is_authenticated %}
 {% set profile = request.profile if logged_in else None %}
 {% if logged_in %}
-  {% if include_hr %}<hr>{% endif %}
-  <div class="page-vote actionbar">
-    <span class="actionbar-block" style="justify-content: flex-start;">
-      <span id="like-button-{{pagevote.id}}"
-        class="like-button actionbar-button {% if pagevote.vote_score(request.profile) == 1 %}voted{% endif %}"
-        onclick="javascript:pagevote_upvote({{ pagevote.id }})"
-      >
-        <span class="pagevote-score" id="pagevote-score-{{pagevote.id}}">{{ pagevote.score }}</span>
-        <i class="fa fa-thumbs-o-up" style="font-size: large;"></i>
-        <span class="actionbar-text">{{_("Like")}}</span>
-      </span>
-      <span id="dislike-button-{{pagevote.id}}" class="dislike-button actionbar-button {% if pagevote.vote_score(request.profile) == -1 %}voted{% endif %}" onclick="javascript:pagevote_downvote({{ pagevote.id }})">
-        <i class="fa fa-thumbs-o-down" style="font-size: large;"></i>
-      </span>
+{% if include_hr %}
+<hr>{% endif %}
+<div class="page-vote actionbar">
+  <span class="actionbar-block" style="justify-content: flex-start;">
+    <span id="like-button-{{pagevote.id}}"
+      class="like-button actionbar-button {% if pagevote.vote_score(request.profile) == 1 %}voted{% endif %}"
+      onclick="javascript:pagevote_upvote({{ pagevote.id }})">
+      <span class="pagevote-score" id="pagevote-score-{{pagevote.id}}">{{ pagevote.score }}</span>
+      <i class="fa fa-thumbs-o-up" style="font-size: large;"></i>
+      <span class="actionbar-text">{{_("Like")}}</span>
     </span>
-    {% if not hide_actionbar_comment %}
-      <span class="actionbar-block">
-        <span class="actionbar-button actionbar-comment">
-          <i class="fa fa-comment-o" style="font-size: large;"></i>
-          <span class="actionbar-text">{{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif %}</span>
-        </span>
-      </span>
-    {% endif %}
-    <span class="actionbar-block">
-      <span id="bookmark-button-{{bookmark.id}}"
-        class="bookmark-button actionbar-button {% if bookmark.get_bookmark(request.profile) == True %} bookmarked {% endif %}"
-        onclick="javascript:bookmark({{ bookmark.id }})"
-      >
-        <i class="fa fa-bookmark-o" style="font-size: large;"></i>
-        <span class="actionbar-text">{{_("Bookmark")}}</span>
-      </span>
+    <span id="dislike-button-{{pagevote.id}}"
+      class="dislike-button actionbar-button {% if pagevote.vote_score(request.profile) == -1 %}voted{% endif %}"
+      onclick="javascript:pagevote_downvote({{ pagevote.id }})">
+      <i class="fa fa-thumbs-o-down" style="font-size: large;"></i>
     </span>
-    <span class="actionbar-block" >
-      <span class="actionbar-button actionbar-share" style="position: relative" {{"share-url=" + share_url if share_url else ""}}>
-        <i class="fa fa-share" style="font-size: large;"></i>
-        <span class="actionbar-text">{{_("Share")}}</span>
-      </span>
+  </span>
+  {% if not hide_actionbar_comment %}
+  <span class="actionbar-block">
+    <span class="actionbar-button actionbar-comment">
+      <i class="fa fa-comment-o" style="font-size: large;"></i>
+      <span class="actionbar-text">{{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif
+        %}</span>
     </span>
-    {% if actionbar_report_url %}
-      <span class="actionbar-block">
-        <a class="actionbar-button black" href="{{actionbar_report_url}}">
-          <i class="fa fa-flag-o" style="font-size: large;"></i>
-          <span class="actionbar-text">{{_("Report")}}</span>
-        </a>
-      </span>
-    {% endif %}
-  </div>
+  </span>
+  {% endif %}
+  <span class="actionbar-block">
+    <span id="bookmark-button-{{bookmark.id}}"
+      class="bookmark-button actionbar-button {% if bookmark.get_bookmark(request.profile) == True %} bookmarked {% endif %}"
+      onclick="javascript:bookmark({{ bookmark.id }})">
+      <i class="fa fa-bookmark-o" style="font-size: large;"></i>
+      <span class="actionbar-text">{{_("Bookmark")}}</span>
+    </span>
+  </span>
+  <span class="actionbar-block" style="justify-content: flex-end;">
+    <span class="actionbar-button actionbar-share" style="position: relative"
+      {{"share-url=" + share_url if share_url else ""}}>
+        <i class=" fa fa-share" style="font-size: large;"></i>
+      <span class="actionbar-text">{{_("Share")}}</span>
+    </span>
+  </span>
+  {% if actionbar_report_url %}
+  <span class="actionbar-block">
+    <a class="actionbar-button black" href="{{actionbar_report_url}}">
+      <i class="fa fa-flag-o" style="font-size: large;"></i>
+      <span class="actionbar-text">{{_("Report")}}</span>
+    </a>
+  </span>
+  {% endif %}
+</div>
 {% endif %}
\ No newline at end of file
diff --git a/templates/blog/content.html b/templates/blog/content.html
index b9a23fa..e2cf1aa 100644
--- a/templates/blog/content.html
+++ b/templates/blog/content.html
@@ -2,26 +2,26 @@
   <div style="margin-bottom: 0.5em">
     <span class="time">
       {% with authors=post.authors.all() %}
-        {%- if authors -%}
-          <img src="{{gravatar(authors[0])}}" style="width: 1.5em; border-radius: 50%; margin-bottom: -0.3em">
-          <span class="post-authors">{{ link_users(authors) }}</span>
-        {%- endif -%}
+      {%- if authors -%}
+      <img src="{{gravatar(authors[0])}}" style="width: 1.5em; border-radius: 50%; margin-bottom: -0.3em">
+      <span class="post-authors">{{ link_users(authors) }}</span>
+      {%- endif -%}
       {% endwith %}
       &#8226;
       {{ relative_time(post.publish_on, abs=_('on {time}'), rel=_('{time}')) -}}
       {%- if post.sticky %} &#8226;
-        <i title="Sticky" class="fa fa-star fa-fw"></i>{% endif -%}
+      <i title="Sticky" class="fa fa-star fa-fw"></i>{% endif -%}
       {% if post.is_organization_private and show_organization_private_icon %}
-        &#8226;
-        <span>
-          {% for org in post.organizations.all() %}
-            <span class="organization-tag" style="display: inherit;">
-              <a href="{{ org.get_absolute_url() }}">
-                <i class="fa fa-lock"></i> {{ org.name }}
-              </a>
-            </span>
-          {% endfor %}
+      &#8226;
+      <span>
+        {% for org in post.organizations.all() %}
+        <span class="organization-tag" style="display: inherit;">
+          <a href="{{ org.get_absolute_url() }}">
+            <i class="fa fa-lock"></i> {{ org.name }}
+          </a>
         </span>
+        {% endfor %}
+      </span>
       {% endif %}
     </span>
     <span style="float: right">
@@ -39,9 +39,12 @@
   <div class="blog-description">
     <div class="summary content-description">
       {% cache 86400 'post_summary' post.id %}
-        {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }}
+      {{ post.summary|default(post.content, true)|markdown(lazy_load=True)|reference|str|safe }}
       {% endcache %}
     </div>
+  </div>
+  <div class="show-more"> {{_("...Xem thêm")}} </div>
+  <div class="actionbar-box">
     {% set pagevote = post.pagevote %}
     {% set bookmark = post.bookmark %}
     {% set hide_actionbar_comment = True %}
diff --git a/templates/three-column-content.html b/templates/three-column-content.html
index eea22ee..4a7a84c 100644
--- a/templates/three-column-content.html
+++ b/templates/three-column-content.html
@@ -32,21 +32,20 @@
 {% block js_media %}
 <script type="text/javascript">
   function activateBlogBoxOnClick() {
-    $('.blog-box').on('click', function () {
-      var $description = $(this).children('.blog-description');
+    $('.show-more').on('click', function () {
+      var $description = $(this).parent().children('.blog-description');
       var max_height = $description.css('max-height');
       if (max_height !== 'fit-content') {
         $description.css('max-height', 'fit-content');
-        $(this).css('cursor', 'auto');
-        $(this).removeClass('pre-expand-blog');
-        $(this).find('.actionbar').show();
+        $(this).parent().css('cursor', 'auto');
+        $(this).parent().removeClass('pre-expand-blog');
+        console.log($(this).parent());
+        $(this).hide();
       }
     })
     $('.blog-box').each(function () {
       if ($(this).prop('scrollHeight') > $(this).height()) {
         $(this).addClass('pre-expand-blog');
-        $(this).css('cursor', 'pointer');
-        $(this).find('.actionbar').hide();
       }
     });
   }

From d736381bebe5055292abb9ab307b9e5e2aa724ed Mon Sep 17 00:00:00 2001
From: zhaospei <dungbuit1k28@gmail.com>
Date: Sun, 5 Feb 2023 20:22:17 +0700
Subject: [PATCH 2/3] update darkmode

---
 resources/blog.scss    |  2 +-
 resources/darkmode.css | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/resources/blog.scss b/resources/blog.scss
index 4f95d00..98e9008 100644
--- a/resources/blog.scss
+++ b/resources/blog.scss
@@ -223,7 +223,7 @@
 }
 
 .show-more {
-    color: var(--color-accent-dark);
+    color: black;
     font-style: italic;
     font-size: 16px;
     font-weight: 700;
diff --git a/resources/darkmode.css b/resources/darkmode.css
index bd9bde3..321448d 100644
--- a/resources/darkmode.css
+++ b/resources/darkmode.css
@@ -1938,16 +1938,11 @@ noscript #noscript {
     border-bottom-color: rgb(140, 130, 115);
     color: rgb(232, 230, 227);
 }
-.pre-expand-blog::before {
-    background-image: -webkit-linear-gradient(bottom,
-    rgb(96, 104, 108),
-    rgb(49, 53, 55) 3%,
-    rgba(0, 0, 0, 0) 8%,
-    rgba(0, 0, 0, 0) 100%);
-}
-.pre-expand-blog:hover {
-    background-color: rgb(31, 33, 35);
+.show-more {
+    color: white;
+    background: linear-gradient(rgba(24, 26, 27, 0) 1%, rgb(31, 33, 35) 95%, rgb(31, 33, 35) 100%);
 }
+
 @media (min-width: 800px) {
     .blog-box {
         border-left-color: rgb(60, 65, 68);

From ef1096c9f39f9c250f195b16c066de8f508e6aa4 Mon Sep 17 00:00:00 2001
From: zhaospei <dungbuit1k28@gmail.com>
Date: Sun, 5 Feb 2023 20:41:18 +0700
Subject: [PATCH 3/3] add show-more comment and add trans

---
 locale/vi/LC_MESSAGES/django.po    | 554 +++++++++++++++--------------
 locale/vi/LC_MESSAGES/dmoj-user.po |   6 +
 templates/blog/content.html        |   2 +-
 templates/problem/feed.html        | 273 +++++++-------
 4 files changed, 428 insertions(+), 407 deletions(-)

diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po
index aeee9b4..42dcc74 100644
--- a/locale/vi/LC_MESSAGES/django.po
+++ b/locale/vi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lqdoj2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-28 08:12+0700\n"
+"POT-Creation-Date: 2023-02-05 20:37+0700\n"
 "PO-Revision-Date: 2021-07-20 03:44\n"
 "Last-Translator: Icyene\n"
 "Language-Team: Vietnamese\n"
@@ -20,8 +20,8 @@ msgstr ""
 
 #: chat_box/models.py:31 chat_box/models.py:51 chat_box/models.py:65
 #: judge/admin/interface.py:150 judge/models/contest.py:633
-#: judge/models/contest.py:842 judge/models/profile.py:368
-#: judge/models/profile.py:444
+#: judge/models/contest.py:842 judge/models/course.py:115
+#: judge/models/profile.py:368 judge/models/profile.py:444
 msgid "user"
 msgstr "người dùng"
 
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Login"
 msgstr "Đăng nhập"
 
-#: dmoj/urls.py:211 templates/base.html:208
+#: dmoj/urls.py:211 templates/base.html:209
 #: templates/organization/org-left-sidebar.html:2
 msgid "Home"
 msgstr "Trang chủ"
@@ -164,7 +164,7 @@ msgstr "Tính toán lại kết quả"
 msgid "username"
 msgstr "tên đăng nhập"
 
-#: judge/admin/contest.py:503 templates/base.html:316
+#: judge/admin/contest.py:503 templates/base.html:317
 msgid "virtual"
 msgstr "ảo"
 
@@ -213,7 +213,7 @@ msgstr "Mạng Xã Hội"
 msgid "Taxonomy"
 msgstr ""
 
-#: judge/admin/problem.py:215 judge/admin/problem.py:433
+#: judge/admin/problem.py:215 judge/admin/problem.py:438
 #: templates/contest/contest.html:102 templates/problem/data.html:517
 #: templates/problem/list.html:22 templates/problem/list.html:48
 #: templates/user/base-users-table.html:10 templates/user/user-about.html:36
@@ -226,7 +226,7 @@ msgid "Limits"
 msgstr "Giới hạn"
 
 #: judge/admin/problem.py:217 judge/admin/submission.py:353
-#: templates/base.html:244 templates/stats/tab.html:4
+#: templates/base.html:245 templates/stats/tab.html:4
 #: templates/submission/list.html:347
 msgid "Language"
 msgstr "Ngôn ngữ"
@@ -259,28 +259,28 @@ msgstr[0] "%d bài tập đã được đánh dấu riêng tư."
 msgid "Mark problems as private"
 msgstr "Đánh dấu các bài tập là riêng tư"
 
-#: judge/admin/problem.py:427 judge/admin/submission.py:316
+#: judge/admin/problem.py:432 judge/admin/submission.py:316
 #: templates/problem/list.html:18 templates/problem/list.html:37
 msgid "Problem code"
 msgstr "Mã bài"
 
-#: judge/admin/problem.py:439 judge/admin/submission.py:322
+#: judge/admin/problem.py:444 judge/admin/submission.py:322
 msgid "Problem name"
 msgstr "Tên bài"
 
-#: judge/admin/problem.py:445
+#: judge/admin/problem.py:450
 #, fuzzy
 #| msgid "contest rating"
 msgid "Voter rating"
 msgstr "rating kỳ thi"
 
-#: judge/admin/problem.py:451
+#: judge/admin/problem.py:456
 #, fuzzy
 #| msgid "Total points"
 msgid "Voter point"
 msgstr "Tổng điểm"
 
-#: judge/admin/problem.py:457
+#: judge/admin/problem.py:462
 msgid "Vote"
 msgstr ""
 
@@ -471,7 +471,7 @@ msgstr ""
 msgid "New IOI"
 msgstr "IOI mới"
 
-#: judge/forms.py:102 judge/views/organization.py:542
+#: judge/forms.py:102 judge/views/organization.py:550
 #: judge/views/register.py:62
 #, python-brace-format
 msgid "You may not be part of more than {count} public groups."
@@ -546,15 +546,15 @@ msgstr "{time}"
 msgid "on {time}"
 msgstr "vào {time}"
 
-#: judge/middleware.py:115
+#: judge/middleware.py:125
 msgid "No permission"
 msgstr "Không có quyền truy cập"
 
-#: judge/middleware.py:116
+#: judge/middleware.py:126
 msgid "You need to join this group first"
 msgstr "Bạn phải là thành viên của nhóm."
 
-#: judge/middleware.py:126 judge/middleware.py:127
+#: judge/middleware.py:136 judge/middleware.py:137
 msgid "No such group"
 msgstr "Nhóm không tồn tại"
 
@@ -654,10 +654,6 @@ msgid "Override comment lock"
 msgstr ""
 
 #: judge/models/comment.py:241
-#: src/dmoj-wpadmin/test_project/apps/books/admin.py:24
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:30
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:30
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:30
 msgid "owner"
 msgstr ""
 
@@ -666,9 +662,6 @@ msgid "read"
 msgstr ""
 
 #: judge/models/comment.py:250
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:28
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:28
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:28
 msgid "category"
 msgstr ""
 
@@ -743,14 +736,8 @@ msgid "These users will be able to view the contest, but not edit it."
 msgstr ""
 "Những người dùng này có thể thấy kỳ thi nhưng không có quyền chỉnh sửa."
 
-#: judge/models/contest.py:117 judge/models/runtime.py:211
-#: src/dmoj-wpadmin/test_project/apps/books/admin.py:20
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:13
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:27
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:13
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:27
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:13
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:27
+#: judge/models/contest.py:117 judge/models/course.py:158
+#: judge/models/runtime.py:211
 msgid "description"
 msgstr "mô tả"
 
@@ -791,7 +778,8 @@ msgstr ""
 "Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn đóng băng kỳ thi sau 2h, "
 "hãy nhập 02:00:00"
 
-#: judge/models/contest.py:140 judge/models/problem.py:222
+#: judge/models/contest.py:140 judge/models/course.py:28
+#: judge/models/course.py:164 judge/models/problem.py:222
 msgid "publicly visible"
 msgstr "công khai"
 
@@ -894,8 +882,9 @@ msgstr ""
 msgid "private to organizations"
 msgstr "riêng tư với các tổ chức"
 
-#: judge/models/contest.py:225 judge/models/interface.py:88
-#: judge/models/problem.py:275 judge/models/profile.py:130
+#: judge/models/contest.py:225 judge/models/course.py:34
+#: judge/models/interface.py:88 judge/models/problem.py:275
+#: judge/models/profile.py:130
 msgid "organizations"
 msgstr "tổ chức"
 
@@ -1017,7 +1006,7 @@ msgstr "Cách hiển thị thứ tự bài tập"
 
 #: judge/models/contest.py:617 judge/models/contest.py:764
 #: judge/models/contest.py:845 judge/models/contest.py:875
-#: judge/models/submission.py:116
+#: judge/models/course.py:178 judge/models/submission.py:116
 msgid "contest"
 msgstr "kỳ thi"
 
@@ -1108,7 +1097,7 @@ msgid "problem"
 msgstr "bài tập"
 
 #: judge/models/contest.py:768 judge/models/contest.py:828
-#: judge/models/problem.py:206
+#: judge/models/course.py:182 judge/models/problem.py:206
 msgid "points"
 msgstr "điểm"
 
@@ -1233,6 +1222,79 @@ msgstr ""
 msgid "clarification timestamp"
 msgstr ""
 
+#: judge/models/course.py:21
+#, fuzzy
+#| msgid "username"
+msgid "course name"
+msgstr "tên đăng nhập"
+
+#: judge/models/course.py:23 judge/models/profile.py:46
+msgid "organization description"
+msgstr "mô tả tổ chức"
+
+#: judge/models/course.py:25
+#, fuzzy
+#| msgid "end time"
+msgid "ending time"
+msgstr "thời gian kết thúc"
+
+#: judge/models/course.py:35
+#, fuzzy
+#| msgid "If private, only these organizations may see the contest"
+msgid "If private, only these organizations may see the course"
+msgstr "Nếu riêng tư, chỉ những tổ chức này thấy được kỳ thi"
+
+#: judge/models/course.py:39
+msgid "course slug"
+msgstr ""
+
+#: judge/models/course.py:40
+#, fuzzy
+#| msgid "Organization name shown in URL"
+msgid "Course name shown in URL"
+msgstr "Tên được hiển thị trong đường dẫn"
+
+#: judge/models/course.py:43 judge/models/profile.py:38
+msgid "Only alphanumeric and hyphens"
+msgstr ""
+
+#: judge/models/course.py:47
+#, fuzzy
+#| msgid "Registration"
+msgid "public registration"
+msgstr "Đăng ký"
+
+#: judge/models/course.py:51
+msgid "course image"
+msgstr ""
+
+#: judge/models/course.py:109 judge/models/course.py:147
+#: judge/models/course.py:172
+msgid "course"
+msgstr ""
+
+#: judge/models/course.py:117
+msgid "user_of_course"
+msgstr ""
+
+#: judge/models/course.py:121
+msgid "Student"
+msgstr ""
+
+#: judge/models/course.py:122
+msgid "Assistant"
+msgstr ""
+
+#: judge/models/course.py:123
+msgid "Teacher"
+msgstr ""
+
+#: judge/models/course.py:152
+#, fuzzy
+#| msgid "user profiles"
+msgid "course files"
+msgstr "thông tin người dùng"
+
 #: judge/models/interface.py:24
 msgid "configuration item"
 msgstr ""
@@ -1822,18 +1884,10 @@ msgstr "tên ngắn đường dẫn"
 msgid "Organization name shown in URL"
 msgstr "Tên được hiển thị trong đường dẫn"
 
-#: judge/models/profile.py:38
-msgid "Only alphanumeric and hyphens"
-msgstr ""
-
 #: judge/models/profile.py:44
 msgid "Displayed beside user name during contests"
 msgstr "Hiển thị bên cạnh tên người dùng trong kỳ thi"
 
-#: judge/models/profile.py:46
-msgid "organization description"
-msgstr "mô tả tổ chức"
-
 #: judge/models/profile.py:49
 msgid "registrant"
 msgstr "người tạo"
@@ -2597,8 +2651,8 @@ msgstr "Bạn phải giải ít nhất 1 bài trước khi được vote."
 msgid "You already voted."
 msgstr "Bạn đã vote."
 
-#: judge/views/comment.py:158 judge/views/organization.py:842
-#: judge/views/organization.py:988 judge/views/organization.py:1153
+#: judge/views/comment.py:158 judge/views/organization.py:850
+#: judge/views/organization.py:996 judge/views/organization.py:1161
 msgid "Edited from site"
 msgstr "Chỉnh sửa từ web"
 
@@ -2777,91 +2831,91 @@ msgstr "Runtimes"
 msgid "Notifications (%d unseen)"
 msgstr "Thông báo (%d chưa xem)"
 
-#: judge/views/organization.py:140 judge/views/organization.py:146
+#: judge/views/organization.py:148 judge/views/organization.py:154
 msgid "No such organization"
 msgstr "Không có tổ chức như vậy"
 
-#: judge/views/organization.py:141
+#: judge/views/organization.py:149
 #, python-format
 msgid "Could not find an organization with the key \"%s\"."
 msgstr "Không tìm thấy tổ chức với mã \"%s\"."
 
-#: judge/views/organization.py:147
+#: judge/views/organization.py:155
 msgid "Could not find such organization."
 msgstr ""
 
-#: judge/views/organization.py:170
+#: judge/views/organization.py:178
 msgid "Can't edit organization"
 msgstr "Không thể chỉnh sửa tổ chức"
 
-#: judge/views/organization.py:171
+#: judge/views/organization.py:179
 msgid "You are not allowed to edit this organization."
 msgstr "Bạn không được phép chỉnh sửa tổ chức này."
 
-#: judge/views/organization.py:183 judge/views/organization.py:351
+#: judge/views/organization.py:191 judge/views/organization.py:359
 #, fuzzy
 #| msgid "Can't edit organization"
 msgid "Can't access organization"
 msgstr "Không thể chỉnh sửa tổ chức"
 
-#: judge/views/organization.py:184 judge/views/organization.py:352
+#: judge/views/organization.py:192 judge/views/organization.py:360
 msgid "You are not allowed to access this organization."
 msgstr "Bạn không được phép chỉnh sửa tổ chức này."
 
-#: judge/views/organization.py:242 judge/views/register.py:48
+#: judge/views/organization.py:250 judge/views/register.py:48
 #: judge/views/stats.py:184 templates/contest/list.html:85
 #: templates/problem/list-base.html:98 templates/stats/site.html:33
 #: templates/user/user-left-sidebar.html:4 templates/user/user-list-tabs.html:6
 msgid "Groups"
 msgstr "Nhóm"
 
-#: judge/views/organization.py:358
+#: judge/views/organization.py:366
 #, python-format
 msgid "%s Members"
 msgstr "%s Thành viên"
 
-#: judge/views/organization.py:498
+#: judge/views/organization.py:506
 #, python-brace-format
 msgid "All submissions in <a href=\"{1}\">{0}</a>"
 msgstr "Bài nộp trong <a href=\"{1}\">{0}</a>"
 
-#: judge/views/organization.py:528 judge/views/organization.py:534
-#: judge/views/organization.py:541
+#: judge/views/organization.py:536 judge/views/organization.py:542
+#: judge/views/organization.py:549
 msgid "Joining group"
 msgstr "Tham gia nhóm"
 
-#: judge/views/organization.py:529
+#: judge/views/organization.py:537
 msgid "You are already in the group."
 msgstr "Bạn đã ở trong nhóm."
 
-#: judge/views/organization.py:534
+#: judge/views/organization.py:542
 msgid "This group is not open."
 msgstr "Nhóm này là nhóm kín."
 
-#: judge/views/organization.py:557
+#: judge/views/organization.py:565
 msgid "Leaving group"
 msgstr "Rời nhóm"
 
-#: judge/views/organization.py:558
+#: judge/views/organization.py:566
 #, python-format
 msgid "You are not in \"%s\"."
 msgstr "Bạn không ở trong \"%s\"."
 
-#: judge/views/organization.py:583
+#: judge/views/organization.py:591
 #, python-format
 msgid "Request to join %s"
 msgstr "Đăng ký tham gia %s"
 
-#: judge/views/organization.py:614
+#: judge/views/organization.py:622
 msgid "Join request detail"
 msgstr "Chi tiết đơn đăng ký"
 
-#: judge/views/organization.py:662
+#: judge/views/organization.py:670
 #, python-format
 msgid "Managing join requests for %s"
 msgstr "Quản lý đơn đăng ký cho %s"
 
-#: judge/views/organization.py:702
+#: judge/views/organization.py:710
 #, python-format
 msgid ""
 "Your organization can only receive %d more members. You cannot approve %d "
@@ -2870,96 +2924,96 @@ msgstr ""
 "Tổ chức chỉ có thể chứa %d thành viên. Bạn không thể chấp thuận nhiều hơn %d "
 "người."
 
-#: judge/views/organization.py:720
+#: judge/views/organization.py:728
 #, python-format
 msgid "Approved %d user."
 msgid_plural "Approved %d users."
 msgstr[0] "Đã chấp thuận %d người."
 
-#: judge/views/organization.py:723
+#: judge/views/organization.py:731
 #, python-format
 msgid "Rejected %d user."
 msgid_plural "Rejected %d users."
 msgstr[0] "Đã từ chối %d người."
 
-#: judge/views/organization.py:763
+#: judge/views/organization.py:771
 #, python-format
 msgid "Add member for %s"
 msgstr "Thêm thành viên cho %s"
 
-#: judge/views/organization.py:775
+#: judge/views/organization.py:783
 #, fuzzy
 #| msgid "Edited from site"
 msgid "Added members from site"
 msgstr "Chỉnh sửa từ web"
 
-#: judge/views/organization.py:795 judge/views/organization.py:803
+#: judge/views/organization.py:803 judge/views/organization.py:811
 msgid "Can't kick user"
 msgstr "Không thể đuổi"
 
-#: judge/views/organization.py:796
+#: judge/views/organization.py:804
 msgid "The user you are trying to kick does not exist!"
 msgstr ""
 
-#: judge/views/organization.py:804
+#: judge/views/organization.py:812
 #, python-format
 msgid "The user you are trying to kick is not in organization: %s."
 msgstr ""
 
-#: judge/views/organization.py:825 judge/views/organization.py:977
+#: judge/views/organization.py:833 judge/views/organization.py:985
 #, fuzzy, python-format
 #| msgid "Editing %s"
 msgid "Edit %s"
 msgstr "Đang chỉnh sửa %s"
 
-#: judge/views/organization.py:853 templates/organization/list.html:45
+#: judge/views/organization.py:861 templates/organization/list.html:45
 msgid "Create group"
 msgstr "Tạo nhóm"
 
-#: judge/views/organization.py:868
+#: judge/views/organization.py:876
 msgid "Exceeded limit"
 msgstr ""
 
-#: judge/views/organization.py:869
+#: judge/views/organization.py:877
 #, python-format
 msgid "You created too many groups. You can only create at most %d groups"
 msgstr ""
 
-#: judge/views/organization.py:874 judge/views/organization.py:899
-#: judge/views/organization.py:1043
+#: judge/views/organization.py:882 judge/views/organization.py:907
+#: judge/views/organization.py:1051
 msgid "Added from site"
 msgstr "Thêm từ web"
 
-#: judge/views/organization.py:890
+#: judge/views/organization.py:898
 #: templates/organization/org-right-sidebar.html:55
 msgid "Add contest"
 msgstr "Thêm kỳ thi"
 
-#: judge/views/organization.py:933 judge/views/organization.py:1095
+#: judge/views/organization.py:941 judge/views/organization.py:1103
 msgid "Permission denied"
 msgstr "Truy cập bị từ chối"
 
-#: judge/views/organization.py:934
+#: judge/views/organization.py:942
 #, fuzzy
 #| msgid "You are not allowed to edit this organization."
 msgid "You are not allowed to edit this contest"
 msgstr "Bạn không được phép chỉnh sửa tổ chức này."
 
-#: judge/views/organization.py:1032
+#: judge/views/organization.py:1040
 #, python-format
 msgid "Add blog for %s"
 msgstr "Thêm bài đăng cho %s"
 
-#: judge/views/organization.py:1096
+#: judge/views/organization.py:1104
 msgid "Not allowed to edit this blog"
 msgstr "Bạn không được phép chỉnh sửa bài đăng này."
 
-#: judge/views/organization.py:1128
+#: judge/views/organization.py:1136
 #, python-format
 msgid "Edit blog %s"
 msgstr "Chỉnh sửa %s"
 
-#: judge/views/organization.py:1179
+#: judge/views/organization.py:1187
 #, python-format
 msgid "Pending blogs in %s"
 msgstr "Bài đang đợi duyệt trong %s"
@@ -2983,41 +3037,41 @@ msgstr "Hướng dẫn cho {0}"
 msgid "Editorial for <a href=\"{1}\">{0}</a>"
 msgstr "Hướng dẫn cho <a href=\"{1}\">{0}</a>"
 
-#: judge/views/problem.py:461 templates/contest/contest.html:97
+#: judge/views/problem.py:463 templates/contest/contest.html:97
 #: templates/organization/org-left-sidebar.html:4
 #: templates/user/user-about.html:28 templates/user/user-bookmarks.html:34
 #: templates/user/user-tabs.html:5 templates/user/users-table.html:19
 msgid "Problems"
 msgstr "Bài tập"
 
-#: judge/views/problem.py:835
+#: judge/views/problem.py:837
 msgid "Problem feed"
 msgstr "Bài tập"
 
-#: judge/views/problem.py:1073
+#: judge/views/problem.py:1075
 msgid "Banned from submitting"
 msgstr "Bị cấm nộp bài"
 
-#: judge/views/problem.py:1075
+#: judge/views/problem.py:1077
 msgid ""
 "You have been declared persona non grata for this problem. You are "
 "permanently barred from submitting this problem."
 msgstr "Bạn đã bị cấm nộp bài này."
 
-#: judge/views/problem.py:1098
+#: judge/views/problem.py:1100
 msgid "Too many submissions"
 msgstr "Quá nhiều lần nộp"
 
-#: judge/views/problem.py:1100
+#: judge/views/problem.py:1102
 msgid "You have exceeded the submission limit for this problem."
 msgstr "Bạn đã vượt quá số lần nộp cho bài này."
 
-#: judge/views/problem.py:1179 judge/views/problem.py:1184
+#: judge/views/problem.py:1181 judge/views/problem.py:1186
 #, python-format
 msgid "Submit to %(problem)s"
 msgstr "Nộp bài cho %(problem)s"
 
-#: judge/views/problem.py:1207
+#: judge/views/problem.py:1209
 msgid "Clone Problem"
 msgstr "Nhân bản bài tập"
 
@@ -3228,8 +3282,8 @@ msgstr "Phải qua một kỳ thi"
 #: judge/views/submission.py:872
 #, python-brace-format
 msgid ""
-"<a href=\"{1}\">{0}</a>'s submissions for <a href=\"{3}\">{2}</a> in <a href="
-"\"{5}\">{4}</a>"
+"<a href=\"{1}\">{0}</a>'s submissions for <a href=\"{3}\">{2}</a> in <a "
+"href=\"{5}\">{4}</a>"
 msgstr ""
 "Các bài nộp của <a href=\"{1}\">{0}</a> cho <a href=\"{3}\">{2}</a> trong <a "
 "href=\"{5}\">{4}</a>"
@@ -3334,7 +3388,7 @@ msgid "Updated on site"
 msgstr "Được cập nhật trên web"
 
 #: judge/views/user.py:431 templates/admin/auth/user/change_form.html:14
-#: templates/admin/auth/user/change_form.html:17 templates/base.html:281
+#: templates/admin/auth/user/change_form.html:17 templates/base.html:282
 #: templates/user/user-tabs.html:11
 msgid "Edit profile"
 msgstr "Chỉnh sửa thông tin"
@@ -3357,164 +3411,23 @@ msgstr "Dữ liệu không hợp lệ: %s"
 msgid "Bad latitude or longitude"
 msgstr "Kinh độ / Vĩ độ không hợp lệ"
 
-#: src/dmoj-wpadmin/test_project/apps/authors/models.py:9
-#, fuzzy
-#| msgid "short name"
-msgid "first name"
-msgstr "tên ngắn"
-
-#: src/dmoj-wpadmin/test_project/apps/authors/models.py:10
-#, fuzzy
-#| msgid "short name"
-msgid "last name"
-msgstr "tên ngắn"
-
-#: src/dmoj-wpadmin/test_project/apps/authors/models.py:11
-msgid "biography"
-msgstr "tiểu sử"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:12
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:12
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:12
-msgid "name"
-msgstr "tên"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:19
-msgid "Category of Books"
-msgstr "Thể loại sách"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:20
-msgid "Categories of Books"
-msgstr "Thể loại sách"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:26
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:26
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:26
-msgid "title"
-msgstr "tiêu đề"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:29
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:29
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:29
-msgid "author"
-msgstr "tác giả"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:31
-msgid "publication date"
-msgstr "ngày xuất bản"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:37
-msgid "Book"
-msgstr "Sách"
-
-#: src/dmoj-wpadmin/test_project/apps/books/models.py:38
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:136
-msgid "Books"
-msgstr "Sách"
-
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:19
-msgid "Category of CDs"
-msgstr "Thể loại CDs"
-
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:20
-msgid "Categories of CDs"
-msgstr "Thể loại CDs"
-
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:36
-msgid "CD"
-msgstr ""
-
-#: src/dmoj-wpadmin/test_project/apps/cds/models.py:37
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:141
-msgid "CDs"
-msgstr ""
-
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:19
-msgid "Category of DVDs"
-msgstr "Thể loại DVDs"
-
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:20
-msgid "Categories of DVDs"
-msgstr "Thể loại DVDs"
-
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:36
-msgid "DVD"
-msgstr ""
-
-#: src/dmoj-wpadmin/test_project/apps/dvds/models.py:37
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:146
-msgid "DVDs"
-msgstr ""
-
-#: src/dmoj-wpadmin/test_project/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Quản trị viên Django"
-
-#: src/dmoj-wpadmin/test_project/test_project/forms.py:12
-#, python-format
-msgid ""
-"Please enter the correct %(username)s and password for an admin account. "
-"Note that both fields may be case-sensitive."
-msgstr ""
-"Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản quản trị. Chú ý cả "
-"hai trường có phân biệt chữ Hoa-thường."
-
-#: src/dmoj-wpadmin/test_project/test_project/forms.py:32
-#, python-format
-msgid ""
-"Please enter the correct %(username)s and password for an user account. Note "
-"that both fields may be case-sensitive."
-msgstr ""
-"Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản thành viên. Chú ý cả "
-"hai trường có phân biệt chữ Hoa-thường."
-
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:27
-#: templates/stats/tab.html:5
-msgid "Site"
-msgstr "Trang"
-
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:38
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:41
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:130
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:133
-msgid "Dashboard"
-msgstr "Bảng điều khiển"
-
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:48
-msgid "Applications"
-msgstr "Ứng dụng"
-
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:53
-#, fuzzy
-#| msgid "administrators"
-msgid "Administration"
-msgstr "người quản lý"
-
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:64
-msgid "Color theme"
-msgstr "Chủ đề màu sắc"
-
-#: src/dmoj-wpadmin/test_project/test_project/wp.py:66
-msgid "Change color theme"
-msgstr "Đổi chủ đề màu sắc"
-
 #: templates/actionbar/list.html:13
 msgid "Like"
 msgstr "Thích"
 
-#: templates/actionbar/list.html:23
+#: templates/actionbar/list.html:25
 msgid "Comment"
 msgstr "Bình luận"
 
-#: templates/actionbar/list.html:33 templates/user/user-tabs.html:10
+#: templates/actionbar/list.html:35 templates/user/user-tabs.html:10
 msgid "Bookmark"
 msgstr "Lưu"
 
-#: templates/actionbar/list.html:39
+#: templates/actionbar/list.html:42
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: templates/actionbar/list.html:46
+#: templates/actionbar/list.html:49
 msgid "Report"
 msgstr "Báo cáo"
 
@@ -3566,23 +3479,23 @@ msgstr "Chỉnh sửa thông tin"
 msgid "Rejudge"
 msgstr "Chấm lại"
 
-#: templates/base.html:226 templates/chat/chat.html:580
+#: templates/base.html:227 templates/chat/chat.html:580
 msgid "Chat"
 msgstr "Chat"
 
-#: templates/base.html:236
+#: templates/base.html:237
 msgid "Notification"
 msgstr "Thông báo"
 
-#: templates/base.html:257
+#: templates/base.html:258
 msgid "Dark Mode"
 msgstr ""
 
-#: templates/base.html:273
+#: templates/base.html:274
 msgid "Profile"
 msgstr "Trang cá nhân"
 
-#: templates/base.html:275 templates/chat/chat.html:20
+#: templates/base.html:276 templates/chat/chat.html:20
 #: templates/comments/list.html:125 templates/contest/contest-list-tabs.html:4
 #: templates/contest/ranking-table.html:49 templates/internal/base.html:59
 #: templates/organization/org-left-sidebar.html:12
@@ -3593,44 +3506,44 @@ msgstr "Trang cá nhân"
 msgid "Admin"
 msgstr "Admin"
 
-#: templates/base.html:278
+#: templates/base.html:279
 msgid "Internal"
 msgstr "Nội bộ"
 
-#: templates/base.html:279
+#: templates/base.html:280
 msgid "Stats"
 msgstr "Thống kê"
 
-#: templates/base.html:286
+#: templates/base.html:287
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: templates/base.html:295
+#: templates/base.html:296
 #: templates/registration/password_reset_complete.html:4
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: templates/base.html:296 templates/registration/registration_form.html:72
+#: templates/base.html:297 templates/registration/registration_form.html:72
 msgid "or"
 msgstr "hoặc"
 
-#: templates/base.html:297
+#: templates/base.html:298
 msgid "Sign up"
 msgstr "Đăng ký"
 
-#: templates/base.html:310
+#: templates/base.html:311
 msgid "spectating"
 msgstr "đang theo dõi"
 
-#: templates/base.html:322
+#: templates/base.html:323
 msgid "Compete"
 msgstr "Thi"
 
-#: templates/base.html:324
+#: templates/base.html:325
 msgid "General"
 msgstr "Chung"
 
-#: templates/base.html:331
+#: templates/base.html:332
 msgid "This site works best with JavaScript enabled."
 msgstr ""
 
@@ -3643,7 +3556,7 @@ msgstr "đã đăng vào %(time)s"
 #: templates/comments/list.html:119 templates/contest/contest-tabs.html:35
 #: templates/contest/list.html:120 templates/contest/tag-title.html:9
 #: templates/flatpages/admin_link.html:3 templates/license.html:10
-#: templates/problem/editorial.html:16 templates/problem/feed.html:78
+#: templates/problem/editorial.html:16 templates/problem/feed.html:76
 msgid "Edit"
 msgstr "Chỉnh sửa"
 
@@ -3651,6 +3564,10 @@ msgstr "Chỉnh sửa"
 msgid "Edit in"
 msgstr "Chỉnh sửa trong"
 
+#: templates/blog/content.html:46 templates/problem/feed.html:136
+msgid "...More"
+msgstr "...Xem thêm"
+
 #: templates/blog/dashboard.html:21
 #, fuzzy, python-format
 #| msgid ""
@@ -3818,8 +3735,8 @@ msgstr "Ẩn"
 #: templates/comments/list.html:137
 #, python-format
 msgid ""
-"This comment is hidden due to too much negative feedback. Click <a href="
-"\"javascript:comment_show_content(%(id)s)\">here</a> to view it."
+"This comment is hidden due to too much negative feedback. Click <a "
+"href=\"javascript:comment_show_content(%(id)s)\">here</a> to view it."
 msgstr ""
 "Bình luận bị ẩn vì nhiều phản hồi tiêu cực. Nhấp vào <a href=\"javascript:"
 "comment_show_content(%(id)s)\">đây</a> để mở."
@@ -3956,8 +3873,8 @@ msgstr "G:i T, j F, Y"
 #: templates/contest/contest-datetime.html:39
 #, python-format
 msgid ""
-"<b>%(time_limit)s</b> window between <b>%(start_time)s</b> and <b>"
-"%(end_time)s</b>"
+"<b>%(time_limit)s</b> window between <b>%(start_time)s</b> and "
+"<b>%(end_time)s</b>"
 msgstr ""
 "Kéo dài <b>%(time_limit)s</b> từ <b>%(start_time)s</b> đến <b>%(end_time)s</"
 "b>"
@@ -4321,7 +4238,7 @@ msgstr ""
 msgid "Thinking"
 msgstr "Bảng xếp hạng"
 
-#: templates/internal/base.html:82 templates/problem/feed.html:124
+#: templates/internal/base.html:82 templates/problem/feed.html:123
 #, fuzzy
 #| msgid "Feed"
 msgid "Feedback"
@@ -4574,47 +4491,47 @@ msgstr ""
 "viết hướng dẫn này. <br><br> <b>Chép code từ bài hướng dẫn để nộp bài là "
 "hành vi có thể dẫn đến khóa tài khoản.</b>"
 
-#: templates/problem/feed.html:9
+#: templates/problem/feed.html:10
 msgid "FOR YOU"
 msgstr "DÀNH CHO BẠN"
 
-#: templates/problem/feed.html:12
+#: templates/problem/feed.html:13
 msgid "NEW"
 msgstr "MỚI NHẤT"
 
-#: templates/problem/feed.html:16
+#: templates/problem/feed.html:18
 msgid "VOLUNTEER"
 msgstr "TÌNH NGUYỆN"
 
-#: templates/problem/feed.html:22
+#: templates/problem/feed.html:24
 msgid "View your votes"
 msgstr "Xem các đơn đã điền của bạn"
 
-#: templates/problem/feed.html:73
+#: templates/problem/feed.html:69
 msgid "View source"
 msgstr "Xem mã nguồn"
 
-#: templates/problem/feed.html:76
+#: templates/problem/feed.html:73
 msgid "Volunteer form"
 msgstr "Phiếu tình nguyện"
 
-#: templates/problem/feed.html:80
+#: templates/problem/feed.html:79
 msgid "Submit"
 msgstr "Gửi"
 
-#: templates/problem/feed.html:87
+#: templates/problem/feed.html:86
 msgid "Value"
 msgstr "Giá trị"
 
-#: templates/problem/feed.html:94
+#: templates/problem/feed.html:93
 msgid "Knowledge point"
 msgstr "Độ khó kiến thức"
 
-#: templates/problem/feed.html:102
+#: templates/problem/feed.html:101
 msgid "Thinking point"
 msgstr "Độ khó nghĩ"
 
-#: templates/problem/feed.html:110 templates/problem/search-form.html:84
+#: templates/problem/feed.html:109 templates/problem/search-form.html:84
 msgid "Problem types"
 msgstr "Dạng bài"
 
@@ -5158,6 +5075,10 @@ msgstr "Thống kê"
 msgid "AC Submissions by Language"
 msgstr "Thống kê AC theo ngôn ngữ"
 
+#: templates/stats/tab.html:5
+msgid "Site"
+msgstr "Trang"
+
 #: templates/status/judge-status-table.html:4
 msgid "Online"
 msgstr "Trực tuyến"
@@ -5764,6 +5685,91 @@ msgstr "Thông tin"
 msgid "Check all"
 msgstr "Chọn tất cả"
 
+#, fuzzy
+#~| msgid "short name"
+#~ msgid "first name"
+#~ msgstr "tên ngắn"
+
+#, fuzzy
+#~| msgid "short name"
+#~ msgid "last name"
+#~ msgstr "tên ngắn"
+
+#~ msgid "biography"
+#~ msgstr "tiểu sử"
+
+#~ msgid "name"
+#~ msgstr "tên"
+
+#~ msgid "Category of Books"
+#~ msgstr "Thể loại sách"
+
+#~ msgid "Categories of Books"
+#~ msgstr "Thể loại sách"
+
+#~ msgid "title"
+#~ msgstr "tiêu đề"
+
+#~ msgid "author"
+#~ msgstr "tác giả"
+
+#~ msgid "publication date"
+#~ msgstr "ngày xuất bản"
+
+#~ msgid "Book"
+#~ msgstr "Sách"
+
+#~ msgid "Books"
+#~ msgstr "Sách"
+
+#~ msgid "Category of CDs"
+#~ msgstr "Thể loại CDs"
+
+#~ msgid "Categories of CDs"
+#~ msgstr "Thể loại CDs"
+
+#~ msgid "Category of DVDs"
+#~ msgstr "Thể loại DVDs"
+
+#~ msgid "Categories of DVDs"
+#~ msgstr "Thể loại DVDs"
+
+#~ msgid "Django administration"
+#~ msgstr "Quản trị viên Django"
+
+#, python-format
+#~ msgid ""
+#~ "Please enter the correct %(username)s and password for an admin account. "
+#~ "Note that both fields may be case-sensitive."
+#~ msgstr ""
+#~ "Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản quản trị. Chú ý cả "
+#~ "hai trường có phân biệt chữ Hoa-thường."
+
+#, python-format
+#~ msgid ""
+#~ "Please enter the correct %(username)s and password for an user account. "
+#~ "Note that both fields may be case-sensitive."
+#~ msgstr ""
+#~ "Hãy nhập %(username)s và mật khẩu hợp lệ cho tài khoản thành viên. Chú ý "
+#~ "cả hai trường có phân biệt chữ Hoa-thường."
+
+#~ msgid "Dashboard"
+#~ msgstr "Bảng điều khiển"
+
+#~ msgid "Applications"
+#~ msgstr "Ứng dụng"
+
+#, fuzzy
+#~| msgid "administrators"
+#~ msgid "Administration"
+#~ msgstr "người quản lý"
+
+#~ msgid "Color theme"
+#~ msgstr "Chủ đề màu sắc"
+
+#~ msgid "Change color theme"
+#~ msgstr "Đổi chủ đề màu sắc"
+
 #~ msgid "View comments"
 #~ msgstr "Xem bình luận"
 
diff --git a/locale/vi/LC_MESSAGES/dmoj-user.po b/locale/vi/LC_MESSAGES/dmoj-user.po
index 31bcd80..fad4ecc 100644
--- a/locale/vi/LC_MESSAGES/dmoj-user.po
+++ b/locale/vi/LC_MESSAGES/dmoj-user.po
@@ -402,6 +402,9 @@ msgstr ""
 msgid "monotonic-queue"
 msgstr ""
 
+msgid "mst"
+msgstr ""
+
 msgid "multiplicative"
 msgstr ""
 
@@ -555,6 +558,9 @@ msgstr ""
 msgid "tortoise-hare"
 msgstr ""
 
+msgid "Training"
+msgstr ""
+
 msgid "treap/splay"
 msgstr ""
 
diff --git a/templates/blog/content.html b/templates/blog/content.html
index e2cf1aa..524433f 100644
--- a/templates/blog/content.html
+++ b/templates/blog/content.html
@@ -43,7 +43,7 @@
       {% endcache %}
     </div>
   </div>
-  <div class="show-more"> {{_("...Xem thêm")}} </div>
+  <div class="show-more"> {{_("...More")}} </div>
   <div class="actionbar-box">
     {% set pagevote = post.pagevote %}
     {% set bookmark = post.bookmark %}
diff --git a/templates/problem/feed.html b/templates/problem/feed.html
index ff602d8..be3f868 100644
--- a/templates/problem/feed.html
+++ b/templates/problem/feed.html
@@ -1,141 +1,150 @@
 {% extends "problem/list-base.html" %}
 {% block left_sidebar %}
-  {% include "problem/left-sidebar.html" %}
+{% include "problem/left-sidebar.html" %}
 {% endblock %}
 
 {% block middle_content %}
-  <div class="problem-feed-option">
-    <a href="{{url('problem_feed')}}" class="button small  {{'btn-midnightblue' if feed_type=='for_you' else 'btn-gray'}}">
-      {{_('FOR YOU')}}
+<div class="problem-feed-option">
+  <a href="{{url('problem_feed')}}"
+    class="button small  {{'btn-midnightblue' if feed_type=='for_you' else 'btn-gray'}}">
+    {{_('FOR YOU')}}
+  </a>
+  <a href="{{url('problem_feed_new')}}" class="button small {{'btn-midnightblue' if feed_type=='new' else 'btn-gray'}}">
+    {{_('NEW')}}
+  </a>
+  {% if request.user.has_perm('judge.suggest_problem_changes') %}
+  <a href="{{url('problem_feed_volunteer')}}"
+    class="button small {{'btn-midnightblue' if feed_type=='volunteer' else 'btn-gray'}}">
+    {{_('VOLUNTEER')}}
+  </a>
+  {% endif %}
+</div>
+{% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
+<ul style="margin-bottom: 1em; margin-left: auto">
+  <li><a href="{{url('admin:judge_volunteerproblemvote_changelist')}}">{{_('View your votes')}}</a></li>
+</ul>
+{% endif %}
+{% for problem in problems %}
+<div class="blog-box">
+  <h3 class="problem-feed-name">
+    <a href="{{ url('problem_detail', problem.code) }}">
+      {{ problem.i18n_name }}
     </a>
-    <a href="{{url('problem_feed_new')}}" class="button small {{'btn-midnightblue' if feed_type=='new' else 'btn-gray'}}">
-      {{_('NEW')}}
-    </a>
-    {% if request.user.has_perm('judge.suggest_problem_changes') %}
-      <a href="{{url('problem_feed_volunteer')}}" class="button small {{'btn-midnightblue' if feed_type=='volunteer' else 'btn-gray'}}">
-        {{_('VOLUNTEER')}}
-      </a>
+    {% if problem.id in completed_problem_ids %}
+    <i class="solved-problem-color fa fa-check-circle"></i>
+    {% elif problem.id in attempted_problems %}
+    <i class="attempted-problem-color fa fa-minus-circle"></i>
+    {% else %}
+    <i class="unsolved-problem-color fa fa-minus-circle"></i>
+    {% endif %}
+  </h3>
+  {% with authors=problem.authors.all() %}
+  {% if authors %}
+  <div class="problem-feed-info-entry">
+    <i class="fa fa-pencil-square-o fa-fw"></i>
+    <span class="pi-value">{{ link_users(authors) }}</span>
+  </div>
+  {% endif %}
+  {% endwith %}
+  {% if show_types %}
+  <div class="problem-feed-types">
+    <i class="fa fa-tag"></i>
+    {% for type in problem.types_list %}
+    <span class="type-tag">{{ type }}</span>{% if not loop.last %}, {% endif %}
+    {% endfor %}, *{{problem.points | int}}
+  </div>
+  {% endif %}
+  <div class="blog-description">
+    <div class='content-description'>
+      {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
+      {{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
+      {% endcache %}
+      {% if problem.pdf_description %}
+      <embed src="{{url('problem_pdf_description', problem.code)}}" width="100%" height="500" type="application/pdf"
+        style="margin-top: 0.5em">
+      {% endif %}
+    </div>
+    {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
+    <br>
+    <a href="#" class="view-statement-src">{{ _('View source') }}</a>
+    <pre class="statement-src" style="display: none">{{ problem.description|str }}</pre>
+    <hr>
+    <center>
+      <h3>{{_('Volunteer form')}}</h3>
+    </center>
+    <br>
+    <button class="edit-btn" id="edit-{{problem.id}}" pid="{{problem.id}}" style="float: right">{{_('Edit')}}</button>
+    <form class="volunteer-form" id="form-{{problem.id}}" pid="{{problem.id}}" style="display: none;" method="POST">
+      <input type="submit" class="volunteer-submit-btn" id="submit-{{problem.id}}" pid="{{problem.id}}"
+        pcode="{{problem.code}}" style="float: right" value="{{_('Submit')}}">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>
+            </th>
+            <th>
+              {{_('Value')}}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td width="30%">
+              <label for="knowledge_point-{{problem.id}}"><i>{{ _('Knowledge point') }}</i></label>
+            </td>
+            <td>
+              <input id="knowledge_point-{{problem.id}}" type="number" class="point-input" required>
+            </td>
+          </tr>
+          <tr>
+            <td width="30%">
+              <label for="thinking_point-{{problem.id}}"><i>{{ _('Thinking point') }}</i></label>
+            </td>
+            <td>
+              <input id="thinking_point-{{problem.id}}" type="number" class="point-input" required>
+            </td>
+          </tr>
+          <tr>
+            <td width="30%">
+              <label for="types"><i>{{ _('Problem types') }}</i></label>
+            </td>
+            <td>
+              <select id="volunteer-types-{{problem.id}}" name="types" multiple>
+                {% for type in problem_types %}
+                <option value="{{ type.id }}" {% if type in problem.types.all() %} selected{% endif %}>
+                  {{ type.full_name }}
+                </option>
+                {% endfor %}
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <td width="30%">
+              <label for="feedback"><i>{{ _('Feedback') }}</i></label>
+            </td>
+            <td>
+              <textarea id="feedback-{{problem.id}}" rows="2" style="width: 100%"
+                placeholder="{{_('Any additional note here')}}"></textarea>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </form>
+    <center id="thank-{{problem.id}}" style="display: none; margin-top: 3em"></center>
     {% endif %}
   </div>
-  {% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
-    <ul style="margin-bottom: 1em; margin-left: auto">
-      <li><a href="{{url('admin:judge_volunteerproblemvote_changelist')}}">{{_('View your votes')}}</a></li>
-    </ul>
-  {% endif %}
-  {% for problem in problems %}
-    <div class="blog-box">
-      <h3 class="problem-feed-name">
-        <a href="{{ url('problem_detail', problem.code) }}">
-          {{ problem.i18n_name }}
-        </a>
-        {% if problem.id in completed_problem_ids %}
-          <i class="solved-problem-color fa fa-check-circle"></i>
-        {% elif problem.id in attempted_problems %}
-          <i class="attempted-problem-color fa fa-minus-circle"></i>
-        {% else %}
-          <i class="unsolved-problem-color fa fa-minus-circle"></i>
-        {% endif %}
-      </h3>
-      {% with authors=problem.authors.all() %}
-        {% if authors %}
-          <div class="problem-feed-info-entry">
-            <i class="fa fa-pencil-square-o fa-fw"></i>
-            <span class="pi-value">{{ link_users(authors) }}</span>
-          </div>
-        {% endif %}
-      {% endwith %}
-      {% if show_types %}
-        <div class="problem-feed-types">
-          <i class="fa fa-tag"></i>
-          {% for type in problem.types_list %}
-            <span class="type-tag">{{ type }}</span>{% if not loop.last %}, {% endif %}
-          {% endfor %}, *{{problem.points | int}}
-        </div>
-      {% endif %}
-      <div class="blog-description">
-        <div class='content-description'>
-          {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
-            {{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
-          {% endcache %}
-          {% if problem.pdf_description %}
-            <embed src="{{url('problem_pdf_description', problem.code)}}" width="100%" height="500" type="application/pdf" style="margin-top: 0.5em">
-          {% endif %}
-        </div>
-        {% set include_hr = True %}
-        {% set hide_actionbar_comment = True %}
-        {% set pagevote = problem.pagevote %}
-        {% set bookmark = problem.bookmark %}
-        {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %}
-        {% include "actionbar/list.html" %}
-
-        {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
-          <br>
-          <a href="#" class="view-statement-src">{{ _('View source') }}</a>
-          <pre class="statement-src" style="display: none">{{ problem.description|str }}</pre>
-          <hr>
-          <center><h3>{{_('Volunteer form')}}</h3></center>
-          <br>
-          <button class="edit-btn" id="edit-{{problem.id}}" pid="{{problem.id}}" style="float: right">{{_('Edit')}}</button>
-          <form class="volunteer-form" id="form-{{problem.id}}" pid="{{problem.id}}" style="display: none;" method="POST">
-            <input type="submit" class="volunteer-submit-btn" id="submit-{{problem.id}}" pid="{{problem.id}}" pcode="{{problem.code}}" style="float: right" value="{{_('Submit')}}">
-            <table class="table">
-              <thead>
-                <tr>
-                  <th>
-                  </th>
-                  <th>
-                    {{_('Value')}}
-                  </th>
-                </tr>
-              </thead>
-              <tbody>
-                <tr>
-                  <td width="30%">
-                    <label for="knowledge_point-{{problem.id}}"><i>{{ _('Knowledge point') }}</i></label>
-                  </td>
-                  <td>
-                    <input id="knowledge_point-{{problem.id}}" type="number" class="point-input" required>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="30%">
-                    <label for="thinking_point-{{problem.id}}"><i>{{ _('Thinking point') }}</i></label>
-                  </td>
-                  <td>
-                    <input id="thinking_point-{{problem.id}}" type="number" class="point-input" required>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="30%">
-                    <label for="types"><i>{{ _('Problem types') }}</i></label>
-                  </td>
-                  <td>
-                    <select id="volunteer-types-{{problem.id}}" name="types" multiple>
-                      {% for type in problem_types %}
-                        <option value="{{ type.id }}"{% if type in problem.types.all() %} selected{% endif %}>
-                          {{ type.full_name }}
-                        </option>
-                      {% endfor %}
-                    </select>
-                  </td>
-                </tr>
-                <tr>
-                  <td width="30%">
-                    <label for="feedback"><i>{{ _('Feedback') }}</i></label>
-                  </td>
-                  <td>
-                    <textarea id="feedback-{{problem.id}}" rows="2" style="width: 100%" placeholder="{{_('Any additional note here')}}"></textarea>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </form>
-          <center id="thank-{{problem.id}}" style="display: none; margin-top: 3em"></center>
-        {% endif %}
-      </div>
-    </div>
-  {% endfor %}
-  {% if page_obj.num_pages > 1 %}
-    <div style="margin-top:10px;">{% include "list-pages.html" %}</div>
-  {% endif %}
+  <div class="show-more"> {{_("...More")}} </div>
+  <div class="actionbar-box">
+    {% set pagevote = problem.pagevote %}
+    {% set bookmark = problem.bookmark %}
+    {% set hide_actionbar_comment = True %}
+    {% set include_hr = True %}
+    {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %}
+    {% include "actionbar/list.html" %}
+  </div>
+</div>
+{% endfor %}
+{% if page_obj.num_pages > 1 %}
+<div style="margin-top:10px;">{% include "list-pages.html" %}</div>
+{% endif %}
 {% endblock %}
\ No newline at end of file