diff --git a/accounting/converters.py b/accounting/converters.py
index 4a04804..eee1332 100644
--- a/accounting/converters.py
+++ b/accounting/converters.py
@@ -21,7 +21,7 @@
 import datetime
 import re
 
-from django.utils.translation import pgettext
+from django.utils.translation import gettext as _
 
 from .models import Transaction, Record, Account
 from mia_core.period import Period
@@ -124,8 +124,7 @@ class CashAccountConverter:
         if value == "0":
             return Account(
                 code="0",
-                title=pgettext(
-                    "Accounting|", "current assets and liabilities"),
+                title=_("current assets and liabilities"),
             )
         try:
             account = Account.objects.get(code=value)
diff --git a/accounting/forms.py b/accounting/forms.py
index 8b2b70b..b9308df 100644
--- a/accounting/forms.py
+++ b/accounting/forms.py
@@ -21,7 +21,7 @@
 import re
 
 from django import forms
-from django.utils.translation import pgettext
+from django.utils.translation import gettext as _
 
 from .models import Account, Record
 from .validators import validate_record_account_code, validate_record_id
@@ -37,27 +37,26 @@ class RecordForm(forms.Form):
     id = forms.IntegerField(
         required=False,
         error_messages={
-            "invalid": pgettext("Accounting|", "This record is not valid."),
+            "invalid": _("This record is not valid."),
         },
         validators=[validate_record_id])
     account = forms.CharField(
         error_messages={
-            "required": pgettext("Accounting|", "Please select the account."),
+            "required": _("Please select the account."),
         },
         validators=[validate_record_account_code])
     summary = forms.CharField(
         required=False,
         max_length=128,
         error_messages={
-            "max_length": pgettext("Accounting|", "This summary is too long."),
+            "max_length": _("This summary is too long."),
         })
     amount = forms.IntegerField(
         min_value=1,
         error_messages={
-            "required": pgettext("Accounting|", "Please fill in the amount."),
-            "invalid": pgettext("Accounting|", "Please fill in a number."),
-            "min_value": pgettext(
-                "Accounting|", "The amount must be at least 1."),
+            "required": _("Please fill in the amount."),
+            "invalid": _("Please fill in a number."),
+            "min_value": _("The amount must be at least 1."),
         })
 
     def __init__(self, *args, **kwargs):
@@ -108,8 +107,7 @@ class RecordForm(forms.Form):
         if self.transaction is None:
             if "id" in self.data:
                 error = forms.ValidationError(
-                    pgettext("Accounting|",
-                             "This record is not for this transaction."),
+                    _("This record is not for this transaction."),
                     code="not_belong")
                 self.add_error("id", error)
                 raise error
@@ -118,8 +116,7 @@ class RecordForm(forms.Form):
                 record = Record.objects.get(pk=self.data["id"])
                 if record.transaction.pk != self.transaction.pk:
                     error = forms.ValidationError(
-                        pgettext("Accounting|",
-                                 "This record is not for this transaction."),
+                        _("This record is not for this transaction."),
                         code="not_belong")
                     self.add_error("id", error)
                     raise error
@@ -135,16 +132,14 @@ class RecordForm(forms.Form):
         if self.is_credit:
             if not re.match("^([123489]|7[1234])", self.data["account"]):
                 error = forms.ValidationError(
-                    pgettext("Accounting|",
-                             "This account is not for credit records."),
+                    _("This account is not for credit records."),
                     code="not_credit")
                 self.add_error("account", error)
                 raise error
         else:
             if not re.match("^([1235689]|7[5678])", self.data["account"]):
                 error = forms.ValidationError(
-                    pgettext("Accounting|",
-                             "This account is not for debit records."),
+                    _("This account is not for debit records."),
                     code="not_debit")
                 self.add_error("account", error)
                 raise error
@@ -164,13 +159,11 @@ class RecordForm(forms.Form):
         if record.is_credit != self.is_credit:
             if self.is_credit:
                 error = forms.ValidationError(
-                    pgettext("Accounting|",
-                             "This record is not a credit record."),
+                    _("This record is not a credit record."),
                     code="not_credit")
             else:
                 error = forms.ValidationError(
-                    pgettext("Accounting|",
-                             "This record is not a debit record."),
+                    _("This record is not a debit record."),
                     code="not_debit")
             self.add_error("id", error)
             raise error
@@ -188,13 +181,13 @@ class TransactionForm(forms.Form):
     date = forms.DateField(
         required=True,
         error_messages={
-            "invalid": pgettext("Accounting|", "This date is not valid.")
+            "invalid": _("This date is not valid.")
         })
     notes = forms.CharField(
         required=False,
         max_length=128,
         error_messages={
-            "max_length": pgettext("Accounting|", "This notes is too long.")
+            "max_length": _("This notes is too long.")
         })
 
     def __init__(self, *args, **kwargs):
@@ -223,9 +216,8 @@ class TransactionForm(forms.Form):
             return
         if self.debit_total() == self.credit_total():
             return
-        raise forms.ValidationError(pgettext(
-            "Accounting|",
-            "The total amount of debit and credit records are inconsistent."),
+        raise forms.ValidationError(
+            _("The total amount of debit and credit records are inconsistent."),
             code="balance")
 
     def is_valid(self):
diff --git a/accounting/locale/zh_Hant/LC_MESSAGES/django.po b/accounting/locale/zh_Hant/LC_MESSAGES/django.po
index 8cde814..141196d 100644
--- a/accounting/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/accounting/locale/zh_Hant/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mia 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 00:00+0800\n"
-"PO-Revision-Date: 2020-08-05 23:59+0800\n"
+"POT-Creation-Date: 2020-08-06 00:39+0800\n"
+"PO-Revision-Date: 2020-08-06 00:40+0800\n"
 "Last-Translator: imacat <imacat@mail.imacat.idv.tw>\n"
 "Language-Team: Traditional Chinese <imacat@mail.imacat.idv.tw>\n"
 "Language: Traditional Chinese\n"
@@ -16,84 +16,68 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: accounting/converters.py:128 accounting/utils.py:262
-msgctxt "Accounting|"
+#: accounting/converters.py:127 accounting/utils.py:261
 msgid "current assets and liabilities"
 msgstr "流動資產與負債"
 
 #: accounting/forms.py:40
-msgctxt "Accounting|"
 msgid "This record is not valid."
 msgstr "這筆記錄無效。"
 
 #: accounting/forms.py:45
-msgctxt "Accounting|"
 msgid "Please select the account."
 msgstr "請選擇會計科目。"
 
 #: accounting/forms.py:52
-msgctxt "Accounting|"
 msgid "This summary is too long."
 msgstr "摘要太長了。"
 
 #: accounting/forms.py:57
-msgctxt "Accounting|"
 msgid "Please fill in the amount."
 msgstr "請填寫金額。"
 
 #: accounting/forms.py:58
-msgctxt "Accounting|"
 msgid "Please fill in a number."
 msgstr "請填寫數字。"
 
-#: accounting/forms.py:60
-msgctxt "Accounting|"
+#: accounting/forms.py:59
 msgid "The amount must be at least 1."
 msgstr "金額要大於零。"
 
-#: accounting/forms.py:112 accounting/forms.py:122
-msgctxt "Accounting|"
+#: accounting/forms.py:110 accounting/forms.py:119
 msgid "This record is not for this transaction."
 msgstr "這不是這張會計傳票的記錄。"
 
-#: accounting/forms.py:139
-msgctxt "Accounting|"
+#: accounting/forms.py:135
 msgid "This account is not for credit records."
 msgstr "這不是貸方的會計科目。"
 
-#: accounting/forms.py:147
-msgctxt "Accounting|"
+#: accounting/forms.py:142
 msgid "This account is not for debit records."
 msgstr "這不是借方的會計科目。"
 
-#: accounting/forms.py:168
-msgctxt "Accounting|"
+#: accounting/forms.py:162
 msgid "This record is not a credit record."
 msgstr "這不是貸方的會計記錄。"
 
-#: accounting/forms.py:173
-msgctxt "Accounting|"
+#: accounting/forms.py:166
 msgid "This record is not a debit record."
 msgstr "這不是借方的會計記錄。"
 
-#: accounting/forms.py:191
-msgctxt "Accounting|"
+#: accounting/forms.py:184
 msgid "This date is not valid."
 msgstr "請依正確日期格式填寫日期。"
 
-#: accounting/forms.py:197
-msgctxt "Accounting|"
+#: accounting/forms.py:190
 msgid "This notes is too long."
 msgstr "註記太長了。"
 
-#: accounting/forms.py:228
-msgctxt "Accounting|"
+#: accounting/forms.py:220
 msgid "The total amount of debit and credit records are inconsistent."
 msgstr "借方和貸方合計不符。"
 
 #: accounting/templates/accounting/balance-sheet.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Balance Sheet %(prep_period)s"
 msgstr "%(prep_period)s的資產負債表"
 
@@ -106,693 +90,613 @@ msgstr "%(prep_period)s的資產負債表"
 #: accounting/templates/accounting/ledger.html:42
 #: accounting/templates/accounting/search.html:42
 #: accounting/templates/accounting/trial-balance.html:42
-msgctxt "Accounting|"
 msgid "New"
 msgstr "記帳"
 
-#: accounting/templates/accounting/balance-sheet.html:47
-#: accounting/templates/accounting/cash-summary.html:46
-#: accounting/templates/accounting/cash.html:47
-#: accounting/templates/accounting/income-statement.html:47
-#: accounting/templates/accounting/journal.html:47
-#: accounting/templates/accounting/ledger-summary.html:46
-#: accounting/templates/accounting/ledger.html:47
-#: accounting/templates/accounting/search.html:47
-#: accounting/templates/accounting/trial-balance.html:47
-msgctxt "Accounting|"
+#: accounting/templates/accounting/balance-sheet.html:46
+#: accounting/templates/accounting/cash-summary.html:45
+#: accounting/templates/accounting/cash.html:46
+#: accounting/templates/accounting/income-statement.html:46
+#: accounting/templates/accounting/journal.html:46
+#: accounting/templates/accounting/ledger-summary.html:45
+#: accounting/templates/accounting/ledger.html:46
+#: accounting/templates/accounting/search.html:46
+#: accounting/templates/accounting/trial-balance.html:46
 msgid "Cash Expense"
 msgstr "現金支出"
 
-#: accounting/templates/accounting/balance-sheet.html:51
-#: accounting/templates/accounting/cash-summary.html:50
-#: accounting/templates/accounting/cash.html:51
-#: accounting/templates/accounting/income-statement.html:51
-#: accounting/templates/accounting/journal.html:51
-#: accounting/templates/accounting/ledger-summary.html:50
-#: accounting/templates/accounting/ledger.html:51
-#: accounting/templates/accounting/search.html:51
-#: accounting/templates/accounting/trial-balance.html:51
-msgctxt "Accounting|"
+#: accounting/templates/accounting/balance-sheet.html:49
+#: accounting/templates/accounting/cash-summary.html:48
+#: accounting/templates/accounting/cash.html:49
+#: accounting/templates/accounting/income-statement.html:49
+#: accounting/templates/accounting/journal.html:49
+#: accounting/templates/accounting/ledger-summary.html:48
+#: accounting/templates/accounting/ledger.html:49
+#: accounting/templates/accounting/search.html:49
+#: accounting/templates/accounting/trial-balance.html:49
 msgid "Cash Income"
 msgstr "現金收入"
 
-#: accounting/templates/accounting/balance-sheet.html:55
-#: accounting/templates/accounting/cash-summary.html:54
-#: accounting/templates/accounting/cash.html:55
-#: accounting/templates/accounting/income-statement.html:55
-#: accounting/templates/accounting/journal.html:55
-#: accounting/templates/accounting/ledger-summary.html:54
-#: accounting/templates/accounting/ledger.html:55
-#: accounting/templates/accounting/search.html:55
-#: accounting/templates/accounting/trial-balance.html:55
-msgctxt "Accounting|"
+#: accounting/templates/accounting/balance-sheet.html:52
+#: accounting/templates/accounting/cash-summary.html:51
+#: accounting/templates/accounting/cash.html:52
+#: accounting/templates/accounting/income-statement.html:52
+#: accounting/templates/accounting/journal.html:52
+#: accounting/templates/accounting/ledger-summary.html:51
+#: accounting/templates/accounting/ledger.html:52
+#: accounting/templates/accounting/search.html:52
+#: accounting/templates/accounting/trial-balance.html:52
 msgid "Transfer"
 msgstr "轉帳"
 
-#: accounting/templates/accounting/balance-sheet.html:61
-#: accounting/templates/accounting/include/report-chooser.html:103
-msgctxt "Accounting|"
+#: accounting/templates/accounting/balance-sheet.html:56
+#: accounting/templates/accounting/include/report-chooser.html:95
 msgid "Balance Sheet"
 msgstr "資產負債表"
 
-#: accounting/templates/accounting/balance-sheet.html:67
-#: accounting/templates/accounting/cash.html:87
-#: accounting/templates/accounting/income-statement.html:67
-#: accounting/templates/accounting/journal.html:67
-#: accounting/templates/accounting/ledger.html:80
-#: accounting/templates/accounting/trial-balance.html:67
+#: accounting/templates/accounting/balance-sheet.html:62
+#: accounting/templates/accounting/cash.html:82
+#: accounting/templates/accounting/income-statement.html:62
+#: accounting/templates/accounting/journal.html:62
+#: accounting/templates/accounting/ledger.html:75
+#: accounting/templates/accounting/trial-balance.html:62
 msgctxt "Period|"
 msgid "Period"
 msgstr "期間"
 
-#: accounting/templates/accounting/balance-sheet.html:101
-#: accounting/templates/accounting/balance-sheet.html:132
-#: accounting/templates/accounting/balance-sheet.html:169
-#: accounting/templates/accounting/cash-summary.html:97
-#: accounting/templates/accounting/cash-summary.html:112
-#: accounting/templates/accounting/cash.html:106
-#: accounting/templates/accounting/cash.html:132
-#: accounting/templates/accounting/income-statement.html:113
-#: accounting/templates/accounting/journal.html:86
-#: accounting/templates/accounting/journal.html:112
-#: accounting/templates/accounting/ledger-summary.html:90
-#: accounting/templates/accounting/ledger-summary.html:105
-#: accounting/templates/accounting/ledger.html:99
-#: accounting/templates/accounting/ledger.html:135
-#: accounting/templates/accounting/search.html:89
-#: accounting/templates/accounting/search.html:114
-#: accounting/templates/accounting/trial-balance.html:90
-#: accounting/templates/accounting/trial-balance.html:102
-msgctxt "Accounting|"
+#: accounting/templates/accounting/balance-sheet.html:96
+#: accounting/templates/accounting/balance-sheet.html:127
+#: accounting/templates/accounting/balance-sheet.html:164
+#: accounting/templates/accounting/cash-summary.html:92
+#: accounting/templates/accounting/cash-summary.html:107
+#: accounting/templates/accounting/cash.html:101
+#: accounting/templates/accounting/cash.html:125
+#: accounting/templates/accounting/income-statement.html:108
+#: accounting/templates/accounting/journal.html:81
+#: accounting/templates/accounting/journal.html:105
+#: accounting/templates/accounting/ledger-summary.html:85
+#: accounting/templates/accounting/ledger-summary.html:100
+#: accounting/templates/accounting/ledger.html:94
+#: accounting/templates/accounting/ledger.html:126
+#: accounting/templates/accounting/search.html:83
+#: accounting/templates/accounting/search.html:106
+#: accounting/templates/accounting/trial-balance.html:85
+#: accounting/templates/accounting/trial-balance.html:97
 msgid "View"
 msgstr "查閱"
 
-#: accounting/templates/accounting/balance-sheet.html:141
-#: accounting/templates/accounting/balance-sheet.html:178
-#: accounting/templates/accounting/balance-sheet.html:193
-#: accounting/templates/accounting/balance-sheet.html:206
-#: accounting/templates/accounting/balance-sheet.html:247
-#: accounting/templates/accounting/balance-sheet.html:278
-#: accounting/templates/accounting/balance-sheet.html:307
-#: accounting/templates/accounting/balance-sheet.html:316
-#: accounting/templates/accounting/income-statement.html:119
-#: accounting/templates/accounting/income-statement.html:127
-#: accounting/templates/accounting/income-statement.html:182
-#: accounting/templates/accounting/income-statement.html:192
-#: accounting/templates/accounting/transactions/expense/form.html:83
-#: accounting/templates/accounting/transactions/expense/view.html:146
-#: accounting/templates/accounting/transactions/expense/view.html:164
-#: accounting/templates/accounting/transactions/income/form.html:83
-#: accounting/templates/accounting/transactions/income/view.html:146
-#: accounting/templates/accounting/transactions/income/view.html:164
-#: accounting/templates/accounting/transactions/transfer/form.html:85
-#: accounting/templates/accounting/transactions/transfer/form.html:111
-#: accounting/templates/accounting/transactions/transfer/view.html:142
-#: accounting/templates/accounting/transactions/transfer/view.html:160
-#: accounting/templates/accounting/transactions/transfer/view.html:189
-#: accounting/templates/accounting/transactions/transfer/view.html:208
-#: accounting/templates/accounting/trial-balance.html:110
-#: accounting/templates/accounting/trial-balance.html:150
+#: accounting/templates/accounting/balance-sheet.html:136
+#: accounting/templates/accounting/balance-sheet.html:173
+#: accounting/templates/accounting/balance-sheet.html:188
+#: accounting/templates/accounting/balance-sheet.html:201
+#: accounting/templates/accounting/balance-sheet.html:242
+#: accounting/templates/accounting/balance-sheet.html:273
+#: accounting/templates/accounting/balance-sheet.html:302
+#: accounting/templates/accounting/balance-sheet.html:311
+#: accounting/templates/accounting/income-statement.html:114
+#: accounting/templates/accounting/income-statement.html:122
+#: accounting/templates/accounting/income-statement.html:177
+#: accounting/templates/accounting/income-statement.html:187
+#: accounting/templates/accounting/transactions/expense/form.html:82
+#: accounting/templates/accounting/transactions/expense/view.html:145
+#: accounting/templates/accounting/transactions/expense/view.html:163
+#: accounting/templates/accounting/transactions/income/form.html:82
+#: accounting/templates/accounting/transactions/income/view.html:145
+#: accounting/templates/accounting/transactions/income/view.html:163
+#: accounting/templates/accounting/transactions/transfer/form.html:84
+#: accounting/templates/accounting/transactions/transfer/form.html:110
+#: accounting/templates/accounting/transactions/transfer/view.html:141
+#: accounting/templates/accounting/transactions/transfer/view.html:159
+#: accounting/templates/accounting/transactions/transfer/view.html:188
+#: accounting/templates/accounting/transactions/transfer/view.html:207
+#: accounting/templates/accounting/trial-balance.html:105
+#: accounting/templates/accounting/trial-balance.html:145
 #: accounting/views.py:136 accounting/views.py:251 accounting/views.py:399
 #: accounting/views.py:594
-msgctxt "Accounting|"
 msgid "Total"
 msgstr "合計"
 
 #: accounting/templates/accounting/cash-summary.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Cash Summary for %(account)s"
 msgstr "%(account)s的現金帳摘要"
 
-#: accounting/templates/accounting/cash-summary.html:60
-#: accounting/templates/accounting/include/report-chooser.html:73
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:55
+#: accounting/templates/accounting/include/report-chooser.html:71
 msgid "Cash Summary"
 msgstr "現金帳摘要"
 
-#: accounting/templates/accounting/cash-summary.html:66
-#: accounting/templates/accounting/cash.html:67
-#: accounting/templates/accounting/cash.html:101
-#: accounting/templates/accounting/journal.html:81
-#: accounting/templates/accounting/ledger-summary.html:66
-#: accounting/templates/accounting/ledger.html:67
-#: accounting/templates/accounting/ledger.html:94
-#: accounting/templates/accounting/search.html:84
-#: accounting/templates/accounting/transactions/expense/view.html:130
-#: accounting/templates/accounting/transactions/income/view.html:130
-#: accounting/templates/accounting/transactions/transfer/view.html:126
-#: accounting/templates/accounting/transactions/transfer/view.html:173
-#: accounting/templates/accounting/trial-balance.html:87
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:61
+#: accounting/templates/accounting/cash.html:62
+#: accounting/templates/accounting/cash.html:96
+#: accounting/templates/accounting/journal.html:76
+#: accounting/templates/accounting/ledger-summary.html:61
+#: accounting/templates/accounting/ledger.html:62
+#: accounting/templates/accounting/ledger.html:89
+#: accounting/templates/accounting/search.html:78
+#: accounting/templates/accounting/transactions/expense/view.html:129
+#: accounting/templates/accounting/transactions/income/view.html:129
+#: accounting/templates/accounting/transactions/transfer/view.html:125
+#: accounting/templates/accounting/transactions/transfer/view.html:172
+#: accounting/templates/accounting/trial-balance.html:82
 msgid "Account"
 msgstr "科目"
 
-#: accounting/templates/accounting/cash-summary.html:69
-#: accounting/templates/accounting/cash.html:70
-msgctxt "Accounting|Account|"
+#: accounting/templates/accounting/cash-summary.html:64
+#: accounting/templates/accounting/cash.html:65
 msgid "Shortcuts"
 msgstr "常用"
 
-#: accounting/templates/accounting/cash-summary.html:75
-#: accounting/templates/accounting/cash.html:76
-msgctxt "Accounting|Account|"
+#: accounting/templates/accounting/cash-summary.html:70
+#: accounting/templates/accounting/cash.html:71
 msgid "All"
 msgstr "全部"
 
-#: accounting/templates/accounting/cash-summary.html:92
-#: accounting/templates/accounting/ledger-summary.html:85
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:87
+#: accounting/templates/accounting/ledger-summary.html:80
 msgid "Month"
 msgstr "月份"
 
-#: accounting/templates/accounting/cash-summary.html:93
-#: accounting/templates/accounting/cash.html:103
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:88
+#: accounting/templates/accounting/cash.html:98
 msgid "Income"
 msgstr "收入"
 
-#: accounting/templates/accounting/cash-summary.html:94
-#: accounting/templates/accounting/cash.html:104
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:89
+#: accounting/templates/accounting/cash.html:99
 msgid "Expense"
 msgstr "支出"
 
-#: accounting/templates/accounting/cash-summary.html:95
-#: accounting/templates/accounting/cash.html:105
-#: accounting/templates/accounting/ledger-summary.html:88
-#: accounting/templates/accounting/ledger.html:98
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:90
+#: accounting/templates/accounting/cash.html:100
+#: accounting/templates/accounting/ledger-summary.html:83
+#: accounting/templates/accounting/ledger.html:93
 msgid "Balance"
 msgstr "餘額"
 
-#: accounting/templates/accounting/cash-summary.html:96
-#: accounting/templates/accounting/ledger-summary.html:89
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash-summary.html:91
+#: accounting/templates/accounting/ledger-summary.html:84
 msgid "Cumulative Balance"
 msgstr "累計餘額"
 
-#: accounting/templates/accounting/cash-summary.html:166
-#: accounting/templates/accounting/cash.html:210
-#: accounting/templates/accounting/journal.html:198
-#: accounting/templates/accounting/ledger-summary.html:165
-#: accounting/templates/accounting/ledger.html:227
-#: accounting/templates/accounting/search.html:167
-#: accounting/templates/accounting/trial-balance.html:165
+#: accounting/templates/accounting/cash-summary.html:161
+#: accounting/templates/accounting/cash.html:201
+#: accounting/templates/accounting/journal.html:188
+#: accounting/templates/accounting/ledger-summary.html:160
+#: accounting/templates/accounting/ledger.html:214
+#: accounting/templates/accounting/search.html:157
+#: accounting/templates/accounting/trial-balance.html:160
 msgid "There is currently no data."
 msgstr "目前沒有資料。"
 
 #: accounting/templates/accounting/cash.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Cash Account for %(account)s %(prep_period)s"
 msgstr "%(prep_period)s%(account)s的現金帳"
 
-#: accounting/templates/accounting/cash.html:61
-#: accounting/templates/accounting/include/report-chooser.html:68
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash.html:56
+#: accounting/templates/accounting/include/report-chooser.html:67
 msgid "Cash Account"
 msgstr "現金帳"
 
-#: accounting/templates/accounting/cash.html:100
-#: accounting/templates/accounting/journal.html:80
-#: accounting/templates/accounting/ledger.html:93
-#: accounting/templates/accounting/search.html:83
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash.html:95
+#: accounting/templates/accounting/journal.html:75
+#: accounting/templates/accounting/ledger.html:88
+#: accounting/templates/accounting/search.html:77
 msgid "Date"
 msgstr "日期"
 
-#: accounting/templates/accounting/cash.html:102
+#: accounting/templates/accounting/cash.html:97
 #: accounting/templates/accounting/include/summary-helper.html:37
-#: accounting/templates/accounting/journal.html:82
-#: accounting/templates/accounting/ledger.html:95
-#: accounting/templates/accounting/search.html:85
-#: accounting/templates/accounting/transactions/expense/view.html:131
-#: accounting/templates/accounting/transactions/income/view.html:131
-#: accounting/templates/accounting/transactions/transfer/view.html:127
-#: accounting/templates/accounting/transactions/transfer/view.html:174
-msgctxt "Accounting|"
+#: accounting/templates/accounting/journal.html:77
+#: accounting/templates/accounting/ledger.html:90
+#: accounting/templates/accounting/search.html:79
+#: accounting/templates/accounting/transactions/expense/view.html:130
+#: accounting/templates/accounting/transactions/income/view.html:130
+#: accounting/templates/accounting/transactions/transfer/view.html:126
+#: accounting/templates/accounting/transactions/transfer/view.html:173
 msgid "Summary"
 msgstr "摘要"
 
-#: accounting/templates/accounting/cash.html:116
-#: accounting/templates/accounting/cash.html:155
-#: accounting/templates/accounting/journal.html:96
-#: accounting/templates/accounting/journal.html:136
-#: accounting/templates/accounting/journal.html:173
-#: accounting/templates/accounting/ledger.html:109
-#: accounting/templates/accounting/ledger.html:158
-#: accounting/templates/accounting/search.html:99
-#: accounting/templates/accounting/search.html:136
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash.html:111
+#: accounting/templates/accounting/cash.html:148
+#: accounting/templates/accounting/journal.html:91
+#: accounting/templates/accounting/journal.html:129
+#: accounting/templates/accounting/journal.html:164
+#: accounting/templates/accounting/ledger.html:104
+#: accounting/templates/accounting/ledger.html:149
+#: accounting/templates/accounting/search.html:93
+#: accounting/templates/accounting/search.html:128
 msgid "Unbalanced"
 msgstr "借貸不平衡"
 
-#: accounting/templates/accounting/cash.html:121
-#: accounting/templates/accounting/cash.html:161
-#: accounting/templates/accounting/journal.html:101
-#: accounting/templates/accounting/journal.html:142
-#: accounting/templates/accounting/ledger.html:114
-#: accounting/templates/accounting/ledger.html:164
-#: accounting/templates/accounting/search.html:104
-#: accounting/templates/accounting/search.html:142
-msgctxt "Accounting|"
+#: accounting/templates/accounting/cash.html:115
+#: accounting/templates/accounting/cash.html:153
+#: accounting/templates/accounting/journal.html:95
+#: accounting/templates/accounting/journal.html:134
+#: accounting/templates/accounting/ledger.html:108
+#: accounting/templates/accounting/ledger.html:154
+#: accounting/templates/accounting/search.html:97
+#: accounting/templates/accounting/search.html:133
 msgid "Need Reorder"
 msgstr "需排序"
 
 #: accounting/templates/accounting/include/report-chooser.html:33
-msgctxt "Accounting|"
 msgid "Search Accounting Records"
 msgstr "搜尋會計帳"
 
 #: accounting/templates/accounting/include/report-chooser.html:39
-msgctxt "Accounting|"
 msgid "Search:"
 msgstr "搜尋："
 
 #: accounting/templates/accounting/include/report-chooser.html:40
-msgctxt "Accounting|"
 msgid "e.g. Coffee"
 msgstr "如：咖啡"
 
-#: accounting/templates/accounting/include/report-chooser.html:48
-#: accounting/templates/accounting/include/report-chooser.html:108
-#: accounting/templates/accounting/search.html:61
-#: accounting/templates/accounting/search.html:69
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:47
+#: accounting/templates/accounting/include/report-chooser.html:99
+#: accounting/templates/accounting/search.html:56
+#: accounting/templates/accounting/search.html:64
 msgid "Search"
 msgstr "搜尋"
 
-#: accounting/templates/accounting/include/report-chooser.html:63
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:62
 msgid "Book"
 msgstr "帳簿"
 
-#: accounting/templates/accounting/include/report-chooser.html:78
-#: accounting/templates/accounting/ledger.html:61
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:75
+#: accounting/templates/accounting/ledger.html:56
 msgid "Ledger"
 msgstr "分類帳"
 
-#: accounting/templates/accounting/include/report-chooser.html:83
-#: accounting/templates/accounting/ledger-summary.html:60
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:79
+#: accounting/templates/accounting/ledger-summary.html:55
 msgid "Ledger Summary"
 msgstr "分類帳摘要"
 
-#: accounting/templates/accounting/include/report-chooser.html:88
-#: accounting/templates/accounting/journal.html:61
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:83
+#: accounting/templates/accounting/journal.html:56
 msgid "Journal"
 msgstr "日記簿"
 
-#: accounting/templates/accounting/include/report-chooser.html:93
-#: accounting/templates/accounting/trial-balance.html:61
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:87
+#: accounting/templates/accounting/trial-balance.html:56
 msgid "Trial Balance"
 msgstr "試算表"
 
-#: accounting/templates/accounting/include/report-chooser.html:98
-#: accounting/templates/accounting/income-statement.html:61
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:91
+#: accounting/templates/accounting/income-statement.html:56
 msgid "Income Statement"
 msgstr "損益表"
 
-#: accounting/templates/accounting/include/report-chooser.html:113
-msgctxt "Accounting|"
+#: accounting/templates/accounting/include/report-chooser.html:103
 msgid "Accounts"
 msgstr "會計科目"
 
 #: accounting/templates/accounting/include/summary-helper.html:50
-msgctxt "Accounting|Summary|"
 msgid "General"
 msgstr "一般"
 
 #: accounting/templates/accounting/include/summary-helper.html:53
-msgctxt "Accounting|Summary|"
 msgid "Travel"
 msgstr "差旅"
 
 #: accounting/templates/accounting/include/summary-helper.html:56
-msgctxt "Accounting|Summary|"
 msgid "Bus"
 msgstr "公車"
 
 #: accounting/templates/accounting/include/summary-helper.html:59
-msgctxt "Accounting|Summary|"
 msgid "Regular"
 msgstr "帳單"
 
 #: accounting/templates/accounting/include/summary-helper.html:62
-msgctxt "Accounting|Summary|"
 msgid "Count"
 msgstr "數量"
 
 #: accounting/templates/accounting/include/summary-helper.html:69
 #: accounting/templates/accounting/include/summary-helper.html:80
 #: accounting/templates/accounting/include/summary-helper.html:111
-msgctxt "Accounting|Summary|"
 msgid "Category:"
 msgstr "分類："
 
 #: accounting/templates/accounting/include/summary-helper.html:87
 #: accounting/templates/accounting/include/summary-helper.html:124
-msgctxt "Accounting|Summary|"
 msgid "From:"
 msgstr "起點："
 
 #: accounting/templates/accounting/include/summary-helper.html:93
-msgctxt "Accounting|Summary|"
 msgid "Direction:"
 msgstr "方向："
 
 #: accounting/templates/accounting/include/summary-helper.html:101
 #: accounting/templates/accounting/include/summary-helper.html:130
-msgctxt "Accounting|Summary|"
 msgid "To:"
 msgstr "終點："
 
 #: accounting/templates/accounting/include/summary-helper.html:118
-msgctxt "Accounting|Summary|"
 msgid "Route:"
 msgstr "路線："
 
 #: accounting/templates/accounting/include/summary-helper.html:148
-msgctxt "Accounting|Summary|"
 msgid "Count:"
 msgstr "數量："
 
 #: accounting/templates/accounting/include/summary-helper.html:158
-#: accounting/templates/accounting/transactions/expense/view.html:62
-#: accounting/templates/accounting/transactions/income/view.html:62
-#: accounting/templates/accounting/transactions/transfer/view.html:62
+#: accounting/templates/accounting/transactions/expense/view.html:61
+#: accounting/templates/accounting/transactions/income/view.html:61
+#: accounting/templates/accounting/transactions/transfer/view.html:61
 msgid "Confirm"
 msgstr "確定"
 
 #: accounting/templates/accounting/include/summary-helper.html:159
-#: accounting/templates/accounting/transactions/expense/view.html:63
-#: accounting/templates/accounting/transactions/income/view.html:63
-#: accounting/templates/accounting/transactions/transfer/view.html:63
+#: accounting/templates/accounting/transactions/expense/view.html:62
+#: accounting/templates/accounting/transactions/income/view.html:62
+#: accounting/templates/accounting/transactions/transfer/view.html:62
 msgid "Cancel"
 msgstr "取消"
 
 #: accounting/templates/accounting/income-statement.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Income Statement %(prep_period)s"
 msgstr "%(prep_period)s的損益表"
 
-#: accounting/templates/accounting/income-statement.html:85
-msgctxt "Accounting|"
+#: accounting/templates/accounting/income-statement.html:80
 msgid "Amount"
 msgstr "金額"
 
 #: accounting/templates/accounting/journal.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Journal %(prep_period)s"
 msgstr "%(prep_period)s的日記簿"
 
-#: accounting/templates/accounting/journal.html:83
-#: accounting/templates/accounting/ledger-summary.html:86
-#: accounting/templates/accounting/ledger.html:96
-#: accounting/templates/accounting/search.html:86
-#: accounting/templates/accounting/transactions/transfer/form.html:68
-#: accounting/templates/accounting/transactions/transfer/view.html:121
-#: accounting/templates/accounting/trial-balance.html:88
-msgctxt "Accounting|"
+#: accounting/templates/accounting/journal.html:78
+#: accounting/templates/accounting/ledger-summary.html:81
+#: accounting/templates/accounting/ledger.html:91
+#: accounting/templates/accounting/search.html:80
+#: accounting/templates/accounting/transactions/transfer/form.html:67
+#: accounting/templates/accounting/transactions/transfer/view.html:120
+#: accounting/templates/accounting/trial-balance.html:83
 msgid "Debit"
 msgstr "借方"
 
-#: accounting/templates/accounting/journal.html:84
-#: accounting/templates/accounting/ledger-summary.html:87
-#: accounting/templates/accounting/ledger.html:97
-#: accounting/templates/accounting/search.html:87
-#: accounting/templates/accounting/transactions/transfer/form.html:94
-#: accounting/templates/accounting/transactions/transfer/view.html:168
-#: accounting/templates/accounting/trial-balance.html:89
-msgctxt "Accounting|"
+#: accounting/templates/accounting/journal.html:79
+#: accounting/templates/accounting/ledger-summary.html:82
+#: accounting/templates/accounting/ledger.html:92
+#: accounting/templates/accounting/search.html:81
+#: accounting/templates/accounting/transactions/transfer/form.html:93
+#: accounting/templates/accounting/transactions/transfer/view.html:167
+#: accounting/templates/accounting/trial-balance.html:84
 msgid "Credit"
 msgstr "貸方"
 
-#: accounting/templates/accounting/journal.html:85
-#: accounting/templates/accounting/search.html:88
-msgctxt "Accounting|"
+#: accounting/templates/accounting/journal.html:80
+#: accounting/templates/accounting/search.html:82
 msgid "Notes"
 msgstr "註記"
 
 #: accounting/templates/accounting/ledger-summary.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Ledger Summary for %(account)s"
 msgstr "%(account)s的分類帳摘要"
 
 #: accounting/templates/accounting/ledger.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Ledger for %(account)s %(prep_period)s"
 msgstr "%(prep_period)s%(account)s的分類帳"
 
-#: accounting/templates/accounting/ledger.html:119
-#: accounting/templates/accounting/ledger.html:170
-msgctxt "Accounting|"
+#: accounting/templates/accounting/ledger.html:112
+#: accounting/templates/accounting/ledger.html:159
 msgid "Unpaid"
 msgstr "未付款"
 
-#: accounting/templates/accounting/ledger.html:124
-#: accounting/templates/accounting/ledger.html:176
-msgctxt "Accounting|"
+#: accounting/templates/accounting/ledger.html:116
+#: accounting/templates/accounting/ledger.html:164
 msgid "Existing"
 msgstr "尚存"
 
 #: accounting/templates/accounting/search.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Search Result for “%(query)s”"
 msgstr "「%(query)s」搜尋結果"
 
 #: accounting/templates/accounting/transactions/expense/form.html:28
 #: accounting/templates/accounting/transactions/expense/view.html:29
-msgctxt "Accounting|"
 msgid "Cash Expense Transaction"
 msgstr "現金支出傳票"
 
-#: accounting/templates/accounting/transactions/expense/form.html:45
-#: accounting/templates/accounting/transactions/expense/view.html:73
-#: accounting/templates/accounting/transactions/income/form.html:45
-#: accounting/templates/accounting/transactions/income/view.html:73
-#: accounting/templates/accounting/transactions/transfer/form.html:45
-#: accounting/templates/accounting/transactions/transfer/view.html:73
+#: accounting/templates/accounting/transactions/expense/form.html:44
+#: accounting/templates/accounting/transactions/expense/view.html:72
+#: accounting/templates/accounting/transactions/income/form.html:44
+#: accounting/templates/accounting/transactions/income/view.html:72
+#: accounting/templates/accounting/transactions/transfer/form.html:44
+#: accounting/templates/accounting/transactions/transfer/view.html:72
 msgctxt "Navigation|"
 msgid "Back"
 msgstr "回上頁"
 
-#: accounting/templates/accounting/transactions/expense/form.html:58
-#: accounting/templates/accounting/transactions/expense/view.html:123
-#: accounting/templates/accounting/transactions/income/form.html:58
-#: accounting/templates/accounting/transactions/income/view.html:123
-#: accounting/templates/accounting/transactions/transfer/form.html:58
-#: accounting/templates/accounting/transactions/transfer/view.html:115
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/form.html:57
+#: accounting/templates/accounting/transactions/expense/view.html:122
+#: accounting/templates/accounting/transactions/income/form.html:57
+#: accounting/templates/accounting/transactions/income/view.html:122
+#: accounting/templates/accounting/transactions/transfer/form.html:57
+#: accounting/templates/accounting/transactions/transfer/view.html:114
 msgid "Date:"
 msgstr "日期："
 
-#: accounting/templates/accounting/transactions/expense/form.html:93
-#: accounting/templates/accounting/transactions/expense/view.html:172
-#: accounting/templates/accounting/transactions/income/form.html:93
-#: accounting/templates/accounting/transactions/income/view.html:172
-#: accounting/templates/accounting/transactions/transfer/form.html:122
-#: accounting/templates/accounting/transactions/transfer/view.html:218
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/form.html:92
+#: accounting/templates/accounting/transactions/expense/view.html:171
+#: accounting/templates/accounting/transactions/income/form.html:92
+#: accounting/templates/accounting/transactions/income/view.html:171
+#: accounting/templates/accounting/transactions/transfer/form.html:121
+#: accounting/templates/accounting/transactions/transfer/view.html:217
 msgid "Notes:"
 msgstr "註記："
 
-#: accounting/templates/accounting/transactions/expense/form.html:105
-#: accounting/templates/accounting/transactions/income/form.html:105
-#: accounting/templates/accounting/transactions/transfer/form.html:134
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/form.html:104
+#: accounting/templates/accounting/transactions/income/form.html:104
+#: accounting/templates/accounting/transactions/transfer/form.html:133
 msgid "Save"
 msgstr "儲存"
 
-#: accounting/templates/accounting/transactions/expense/view.html:39
-#: accounting/templates/accounting/transactions/income/view.html:39
-#: accounting/templates/accounting/transactions/transfer/view.html:39
+#: accounting/templates/accounting/transactions/expense/view.html:38
+#: accounting/templates/accounting/transactions/income/view.html:38
+#: accounting/templates/accounting/transactions/transfer/view.html:38
 msgid "Error:"
 msgstr "錯誤："
 
-#: accounting/templates/accounting/transactions/expense/view.html:39
-#: accounting/templates/accounting/transactions/income/view.html:39
-#: accounting/templates/accounting/transactions/transfer/view.html:39
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/view.html:38
+#: accounting/templates/accounting/transactions/income/view.html:38
+#: accounting/templates/accounting/transactions/transfer/view.html:38
 msgid ""
 "The transactions on this day are not well-ordered.  Please reorder them."
 msgstr "這一天的傳票次序不齊，請重新排序。"
 
-#: accounting/templates/accounting/transactions/expense/view.html:53
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/view.html:52
 msgid "Cash Expense Transaction Deletion Confirmation"
 msgstr "現金支出傳票刪除確認"
 
-#: accounting/templates/accounting/transactions/expense/view.html:58
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/view.html:57
 msgid "Do you really want to delete this cash expense transaction?"
 msgstr "您真的要刪掉這張現金支出傳票嗎？"
 
-#: accounting/templates/accounting/transactions/expense/view.html:77
-#: accounting/templates/accounting/transactions/income/view.html:77
-#: accounting/templates/accounting/transactions/transfer/view.html:77
+#: accounting/templates/accounting/transactions/expense/view.html:76
+#: accounting/templates/accounting/transactions/income/view.html:76
+#: accounting/templates/accounting/transactions/transfer/view.html:76
 msgctxt "Navigation|"
 msgid "Edit"
 msgstr "編輯"
 
-#: accounting/templates/accounting/transactions/expense/view.html:80
-#: accounting/templates/accounting/transactions/expense/view.html:100
-#: accounting/templates/accounting/transactions/income/view.html:80
-#: accounting/templates/accounting/transactions/income/view.html:100
-#: accounting/templates/accounting/transactions/transfer/view.html:80
-#: accounting/templates/accounting/transactions/transfer/view.html:96
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/view.html:79
+#: accounting/templates/accounting/transactions/expense/view.html:99
+#: accounting/templates/accounting/transactions/income/view.html:79
+#: accounting/templates/accounting/transactions/income/view.html:99
+#: accounting/templates/accounting/transactions/transfer/view.html:79
+#: accounting/templates/accounting/transactions/transfer/view.html:95
 msgid "There is no other transaction at the same day."
 msgstr "當天沒有其他會計傳票。"
 
-#: accounting/templates/accounting/transactions/expense/view.html:82
-#: accounting/templates/accounting/transactions/expense/view.html:87
-#: accounting/templates/accounting/transactions/expense/view.html:102
-#: accounting/templates/accounting/transactions/expense/view.html:107
-#: accounting/templates/accounting/transactions/income/view.html:82
-#: accounting/templates/accounting/transactions/income/view.html:87
-#: accounting/templates/accounting/transactions/income/view.html:102
-#: accounting/templates/accounting/transactions/income/view.html:107
-#: accounting/templates/accounting/transactions/transfer/view.html:82
-#: accounting/templates/accounting/transactions/transfer/view.html:87
-#: accounting/templates/accounting/transactions/transfer/view.html:98
-#: accounting/templates/accounting/transactions/transfer/view.html:103
+#: accounting/templates/accounting/transactions/expense/view.html:81
+#: accounting/templates/accounting/transactions/expense/view.html:86
+#: accounting/templates/accounting/transactions/expense/view.html:101
+#: accounting/templates/accounting/transactions/expense/view.html:106
+#: accounting/templates/accounting/transactions/income/view.html:81
+#: accounting/templates/accounting/transactions/income/view.html:86
+#: accounting/templates/accounting/transactions/income/view.html:101
+#: accounting/templates/accounting/transactions/income/view.html:106
+#: accounting/templates/accounting/transactions/transfer/view.html:81
+#: accounting/templates/accounting/transactions/transfer/view.html:86
+#: accounting/templates/accounting/transactions/transfer/view.html:97
+#: accounting/templates/accounting/transactions/transfer/view.html:102
 msgctxt "Navigation|"
 msgid "Sort"
 msgstr "排序"
 
-#: accounting/templates/accounting/transactions/expense/view.html:92
-#: accounting/templates/accounting/transactions/expense/view.html:112
-#: accounting/templates/accounting/transactions/income/view.html:92
-#: accounting/templates/accounting/transactions/income/view.html:112
+#: accounting/templates/accounting/transactions/expense/view.html:91
+#: accounting/templates/accounting/transactions/expense/view.html:111
+#: accounting/templates/accounting/transactions/income/view.html:91
+#: accounting/templates/accounting/transactions/income/view.html:111
 msgctxt "Navigation|"
 msgid "To Transfer"
 msgstr "改轉帳"
 
-#: accounting/templates/accounting/transactions/expense/view.html:118
-#: accounting/templates/accounting/transactions/income/view.html:118
-#: accounting/templates/accounting/transactions/transfer/view.html:110
+#: accounting/templates/accounting/transactions/expense/view.html:117
+#: accounting/templates/accounting/transactions/income/view.html:117
+#: accounting/templates/accounting/transactions/transfer/view.html:109
 msgctxt "Navigation|"
 msgid "Delete"
 msgstr "刪除"
 
-#: accounting/templates/accounting/transactions/expense/view.html:132
-#: accounting/templates/accounting/transactions/income/view.html:132
-#: accounting/templates/accounting/transactions/transfer/view.html:128
-#: accounting/templates/accounting/transactions/transfer/view.html:175
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/expense/view.html:131
+#: accounting/templates/accounting/transactions/income/view.html:131
+#: accounting/templates/accounting/transactions/transfer/view.html:127
+#: accounting/templates/accounting/transactions/transfer/view.html:174
 msgid "$"
 msgstr "$"
 
-#: accounting/templates/accounting/transactions/expense/view.html:178
-#: accounting/templates/accounting/transactions/income/view.html:178
-#: accounting/templates/accounting/transactions/transfer/view.html:224
+#: accounting/templates/accounting/transactions/expense/view.html:177
+#: accounting/templates/accounting/transactions/income/view.html:177
+#: accounting/templates/accounting/transactions/transfer/view.html:223
 msgid "Created at:"
 msgstr "建檔時間："
 
-#: accounting/templates/accounting/transactions/expense/view.html:183
-#: accounting/templates/accounting/transactions/income/view.html:183
-#: accounting/templates/accounting/transactions/transfer/view.html:229
+#: accounting/templates/accounting/transactions/expense/view.html:182
+#: accounting/templates/accounting/transactions/income/view.html:182
+#: accounting/templates/accounting/transactions/transfer/view.html:228
 msgid "Created by:"
 msgstr "建檔人："
 
-#: accounting/templates/accounting/transactions/expense/view.html:188
-#: accounting/templates/accounting/transactions/income/view.html:188
-#: accounting/templates/accounting/transactions/transfer/view.html:234
+#: accounting/templates/accounting/transactions/expense/view.html:187
+#: accounting/templates/accounting/transactions/income/view.html:187
+#: accounting/templates/accounting/transactions/transfer/view.html:233
 msgid "Updated at:"
 msgstr "更新時間："
 
-#: accounting/templates/accounting/transactions/expense/view.html:193
-#: accounting/templates/accounting/transactions/income/view.html:193
-#: accounting/templates/accounting/transactions/transfer/view.html:239
+#: accounting/templates/accounting/transactions/expense/view.html:192
+#: accounting/templates/accounting/transactions/income/view.html:192
+#: accounting/templates/accounting/transactions/transfer/view.html:238
 msgid "Updated by:"
 msgstr "更新人："
 
 #: accounting/templates/accounting/transactions/income/form.html:28
 #: accounting/templates/accounting/transactions/income/view.html:29
-msgctxt "Accounting|"
 msgid "Cash Income Transaction"
 msgstr "現金收入傳票"
 
-#: accounting/templates/accounting/transactions/income/view.html:53
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/income/view.html:52
 msgid "Cash Income Transaction Deletion Confirmation"
 msgstr "現金收入傳票刪除確認"
 
-#: accounting/templates/accounting/transactions/income/view.html:58
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/income/view.html:57
 msgid "Do you really want to delete this cash income transaction?"
 msgstr "您真的要刪掉這張現金收入傳票嗎？"
 
 #: accounting/templates/accounting/transactions/transfer/form.html:28
 #: accounting/templates/accounting/transactions/transfer/view.html:29
-msgctxt "Accounting|"
 msgid "Transfer Transaction"
 msgstr "轉帳傳票"
 
-#: accounting/templates/accounting/transactions/transfer/view.html:53
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/transfer/view.html:52
 msgid "Transfer Transaction Deletion Confirmation"
 msgstr "轉帳傳票刪除確認"
 
-#: accounting/templates/accounting/transactions/transfer/view.html:58
-msgctxt "Accounting|"
+#: accounting/templates/accounting/transactions/transfer/view.html:57
 msgid "Do you really want to delete this transfer transaction?"
 msgstr "您真的要刪掉這張轉帳傳票嗎？"
 
 #: accounting/templates/accounting/trial-balance.html:30
 #, python-format
-msgctxt "Accounting|"
 msgid "Trial Balance %(prep_period)s"
 msgstr "%(prep_period)s的試算表"
 
-#: accounting/validators.py:41
-msgctxt "Accounting|"
+#: accounting/validators.py:40
 msgid "This record does not exists."
 msgstr "沒有這筆會計記錄。"
 
-#: accounting/validators.py:58
-msgctxt "Accounting|"
+#: accounting/validators.py:56
 msgid "This account does not exist."
 msgstr "沒有這個會計科目。"
 
-#: accounting/validators.py:66
-msgctxt "Accounting|"
+#: accounting/validators.py:63
 msgid "You cannot select a parent account."
 msgstr "請勿選擇上層會計科目。"
 
 #: accounting/views.py:322
-msgctxt "Accounting|"
 msgid "Brought Forward"
 msgstr "上期結轉"
 
 #: accounting/views.py:652
-msgctxt "Accounting|"
 msgid "Gross Income"
 msgstr "營業毛利"
 
 #: accounting/views.py:653
-msgctxt "Accounting|"
 msgid "Operating Income"
 msgstr "營業淨利"
 
 #: accounting/views.py:654
-msgctxt "Accounting|"
 msgid "Before Tax Income"
 msgstr "稅前淨利"
 
 #: accounting/views.py:655
-msgctxt "Accounting|"
 msgid "After Tax Income"
 msgstr "稅後淨利"
 
@@ -809,11 +713,9 @@ msgid "This transaction was deleted successfully."
 msgstr "會計傳票已刪除。"
 
 #: accounting/views.py:1014
-msgctxt "Accounting|"
 msgid "---Accounts In Use---"
 msgstr "-----使用中科目-----"
 
-#: accounting/views.py:1020
-msgctxt "Accounting|"
+#: accounting/views.py:1019
 msgid "---Accounts Not In Use---"
 msgstr "-----未使用科目-----"
diff --git a/accounting/templates/accounting/balance-sheet.html b/accounting/templates/accounting/balance-sheet.html
index 112937c..43e15ca 100644
--- a/accounting/templates/accounting/balance-sheet.html
+++ b/accounting/templates/accounting/balance-sheet.html
@@ -27,7 +27,7 @@ First written: 2020/7/20
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with prep_period=period.prep_desc context "Accounting|" %}Balance Sheet {{ prep_period }}{% endblocktrans %}
+  {% blocktrans asvar title with prep_period=period.prep_desc %}Balance Sheet {{ prep_period }}{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,26 +39,21 @@ First written: 2020/7/20
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-balance-scale" %}
-    {% trans "Balance Sheet" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-balance-scale" current_report_title=_("Balance Sheet") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
@@ -98,7 +93,7 @@ First written: 2020/7/20
                 <td class="actions">
                   <a href="{{ item.url }}" class="btn btn-info" role="button">
                     <i class="fas fa-eye"></i>
-                    {% trans "View" context "Accounting|" as text %}{{ text|force_escape }}
+                    {{ _("View") }}
                   </a>
                 </td>
               </tr>
@@ -129,7 +124,7 @@ First written: 2020/7/20
                 <td class="actions">
                   <a href="{{ item.url }}" class="btn btn-info" role="button">
                     <i class="fas fa-eye"></i>
-                    {% trans "View" context "Accounting|" as text %}{{ text|force_escape }}
+                    {{ _("View") }}
                   </a>
                 </td>
               </tr>
@@ -138,7 +133,7 @@ First written: 2020/7/20
         </tbody>
         <tfoot>
           <tr class="total">
-            <td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+            <td>{{ _("Total") }}</td>
             <td class="amount {% if liabilities.amount < 0 %} text-danger {% endif %}">
               {{ liabilities.amount|accounting_amount }}
             </td>
@@ -166,7 +161,7 @@ First written: 2020/7/20
                 <td class="actions">
                   <a href="{{ item.url }}" class="btn btn-info" role="button">
                     <i class="fas fa-eye"></i>
-                    {% trans "View" context "Accounting|" as text %}{{ text|force_escape }}
+                    {{ _("View") }}
                   </a>
                 </td>
               </tr>
@@ -175,7 +170,7 @@ First written: 2020/7/20
         </tbody>
         <tfoot>
           <tr class="total">
-            <td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+            <td>{{ _("Total") }}</td>
             <td class="amount {% if owners_equity.amount < 0 %} text-danger {% endif %}">
               {{ owners_equity.amount|accounting_amount }}
             </td>
@@ -190,7 +185,7 @@ First written: 2020/7/20
       <table class="table table-borderless table-hover table-sm balance-sheet-total-table">
         <tfoot>
           <tr class="total">
-            <td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+            <td class="align-middle">{{ _("Total") }}</td>
             <td class="text-right align-middle font-italic {% if assets.amount < 0 %} text-danger {% endif %}">
               {{ assets.amount|accounting_amount }}
             </td>
@@ -203,7 +198,7 @@ First written: 2020/7/20
       <table class="table table-borderless table-hover table-sm balance-sheet-total-table">
         <tfoot>
           <tr class="total">
-            <td class="align-middle">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+            <td class="align-middle">{{ _("Total") }}</td>
             <td class="text-right align-middle font-italic {% if liabilities.amount|add:owners_equity.amount < 0 %} text-danger {% endif %}">
               {{ liabilities.amount|add:owners_equity.amount|accounting_amount }}
             </td>
@@ -244,7 +239,7 @@ First written: 2020/7/20
           {% endfor %}
         {% endfor %}
         <li class="list-group-item d-flex justify-content-between align-items-center grand-total">
-          {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+          {{ _("Total") }}
           <span class="badge {% if assets.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
             {{ assets.amount|accounting_amount }}
           </span>
@@ -275,7 +270,7 @@ First written: 2020/7/20
           {% endfor %}
         {% endfor %}
         <li class="list-group-item d-flex justify-content-between align-items-center total">
-          {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+          {{ _("Total") }}
           <span class="badge {% if liabilities.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
             {{ liabilities.amount|accounting_amount }}
           </span>
@@ -304,7 +299,7 @@ First written: 2020/7/20
           {% endfor %}
         {% endfor %}
         <li class="list-group-item d-flex justify-content-between align-items-center total">
-          {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+          {{ _("Total") }}
           <span class="badge {% if owners_equity.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
             {{ owners_equity.amount|accounting_amount }}
           </span>
@@ -313,7 +308,7 @@ First written: 2020/7/20
 
       <ul class="list-group balance-sheet-list">
         <li class="list-group-item d-flex justify-content-between align-items-center grand-total">
-          {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+          {{ _("Total") }}
           <span class="badge {% if liabilities.amount|add:owners_equity.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
             {{ liabilities.amount|add:owners_equity.amount|accounting_amount }}
           </span>
diff --git a/accounting/templates/accounting/cash-summary.html b/accounting/templates/accounting/cash-summary.html
index b5e3585..e67987a 100644
--- a/accounting/templates/accounting/cash-summary.html
+++ b/accounting/templates/accounting/cash-summary.html
@@ -27,7 +27,7 @@ First written: 2020/7/15
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with account=account.title context "Accounting|" %}Cash Summary for {{ account }}{% endblocktrans %}
+  {% blocktrans asvar title with account=account.title %}Cash Summary for {{ account }}{% endblocktrans %}
   {% setvar "title" title %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
 {% endblock %}
@@ -38,41 +38,36 @@ First written: 2020/7/15
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-money-bill-wave" %}
-    {% trans "Cash Summary" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-money-bill-wave" current_report_title=_("Cash Summary") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <span class="d-none d-md-inline">{{ account.title|title_case }}</span>
-      <span class="d-md-none">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</span>
+      <span class="d-md-none">{{ _("Account") }}</span>
     </button>
     <div class="dropdown-menu account-picker">
-      <div class="dropdown-header">{% trans "Shortcuts" context "Accounting|Account|" as text %}{{ text|force_escape }}</div>
+      <div class="dropdown-header">{{ _("Shortcuts") }}</div>
       {% for x in shortcut_accounts %}
         <a class="dropdown-item {% if x.code == account.code %} active {% endif %}>" href="{% url "accounting:cash-summary" x %}">
           {{ x.title|title_case }}
         </a>
       {% endfor %}
-      <div class="dropdown-header">{% trans "All" context "Accounting|Account|" as text %}{{ text|force_escape }}</div>
+      <div class="dropdown-header">{{ _("All") }}</div>
       {% for x in all_accounts %}
         <a class="dropdown-item {% if x.code == account.code %} active {% endif %}>" href="{% url "accounting:cash-summary" x %}">
           {{ x.code }} {{ x.title|title_case }}
@@ -89,12 +84,12 @@ First written: 2020/7/15
   <table class="table table-striped table-hover d-none d-sm-table general-journal-table">
     <thead>
       <tr>
-        <th scope="col">{% trans "Month" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Income" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Expense" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Cumulative Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+        <th scope="col">{{ _("Month") }}</th>
+        <th class="amount" scope="col">{{ _("Income") }}</th>
+        <th class="amount" scope="col">{{ _("Expense") }}</th>
+        <th class="amount" scope="col">{{ _("Balance") }}</th>
+        <th class="amount" scope="col">{{ _("Cumulative Balance") }}</th>
+        <th class="actions" scope="col">{{ _("View") }}</th>
       </tr>
     </thead>
     <tbody>
@@ -109,7 +104,7 @@ First written: 2020/7/15
             {% if item.month is not None %}
               <a class="btn btn-info" role="button" href="{% url "accounting:cash" account item.month|date:"Y-m" %}">
                 <i class="fas fa-eye"></i>
-                <span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
+                <span class="d-none d-lg-inline">{{ _("View") }}</span>
               </a>
             {% endif %}
           </td>
diff --git a/accounting/templates/accounting/cash.html b/accounting/templates/accounting/cash.html
index 69ac39e..157090a 100644
--- a/accounting/templates/accounting/cash.html
+++ b/accounting/templates/accounting/cash.html
@@ -27,7 +27,7 @@ First written: 2020/7/1
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with account=account.title prep_period=period.prep_desc context "Accounting|" %}Cash Account for {{ account }} {{ prep_period }}{% endblocktrans %}
+  {% blocktrans asvar title with account=account.title prep_period=period.prep_desc %}Cash Account for {{ account }} {{ prep_period }}{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,41 +39,36 @@ First written: 2020/7/1
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New") }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense") }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income") }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer") }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-money-bill-wave" %}
-    {% trans "Cash Account" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-money-bill-wave" current_report_title=_("Cash Account") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <span class="d-none d-md-inline">{{ account.title|title_case }}</span>
-      <span class="d-md-none">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</span>
+      <span class="d-md-none">{{ _("Account") }}</span>
     </button>
     <div class="dropdown-menu account-picker">
-      <div class="dropdown-header">{% trans "Shortcuts" context "Accounting|Account|" as text %}{{ text|force_escape }}</div>
+      <div class="dropdown-header">{{ _("Shortcuts") }}</div>
       {% for x in shortcut_accounts %}
         <a class="dropdown-item {% if x.code == account.code %} active {% endif %}>" href="{% url "accounting:cash" x period %}">
           {{ x.title|title_case }}
         </a>
       {% endfor %}
-      <div class="dropdown-header">{% trans "All" context "Accounting|Account|" as text %}{{ text|force_escape }}</div>
+      <div class="dropdown-header">{{ _("All") }}</div>
       {% for x in all_accounts %}
         <a class="dropdown-item {% if x.code == account.code %} active {% endif %}>" href="{% url "accounting:cash" x period %}">
           {{ x.code }} {{ x.title|title_case }}
@@ -97,13 +92,13 @@ First written: 2020/7/1
   <table class="table table-striped table-hover d-none d-md-table general-journal-table">
     <thead>
       <tr>
-        <th scope="col">{% trans "Date" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Income" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Expense" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+        <th scope="col">{{ _("Date") }}</th>
+        <th scope="col">{{ _("Account") }}</th>
+        <th scope="col">{{ _("Summary") }}</th>
+        <th class="amount" scope="col">{{ _("Income") }}</th>
+        <th class="amount" scope="col">{{ _("Expense") }}</th>
+        <th class="amount" scope="col">{{ _("Balance") }}</th>
+        <th class="actions" scope="col">{{ _("View") }}</th>
       </tr>
     </thead>
     <tbody>
@@ -113,13 +108,11 @@ First written: 2020/7/1
           <td>{{ item.account.title|title_case }}</td>
           <td>{{ item.summary|default:"" }}{% if not item.is_balanced %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Unbalanced" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Unbalanced") }}
             </span>
           {% endif %}{% if item.has_order_hole %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Need Reorder" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Need Reorder") }}
             </span>
           {% endif %}</td>
           <td class="amount">{{ item.credit_amount|accounting_amount }}</td>
@@ -129,7 +122,7 @@ First written: 2020/7/1
             {% if item.pk is not None %}
               <a href="{% url_with_return "accounting:transactions.show" item.transaction.type item.transaction %}" class="btn btn-info" role="button">
                 <i class="fas fa-eye"></i>
-                <span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
+                <span class="d-none d-lg-inline">{{ _("View") }}</span>
               </a>
             {% endif %}
           </td>
@@ -152,14 +145,12 @@ First written: 2020/7/1
                 {{ item.summary|default:"" }}
                 {% if not item.is_balanced %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Unbalanced" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Unbalanced") }}
                   </span>
                 {% endif %}
                 {% if item.has_order_hole %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Need Reorder" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Need Reorder") }}
                   </span>
                 {% endif %}
               </div>
diff --git a/accounting/templates/accounting/include/report-chooser.html b/accounting/templates/accounting/include/report-chooser.html
index 9cfd120..91da96a 100644
--- a/accounting/templates/accounting/include/report-chooser.html
+++ b/accounting/templates/accounting/include/report-chooser.html
@@ -30,22 +30,21 @@ First written: 2020/7/9
 
         <!-- Modal Header -->
         <div class="modal-header">
-          <h4 class="modal-title">{% trans "Search Accounting Records" context "Accounting|" as text %}{{ text|force_escape }}</h4>
+          <h4 class="modal-title">{{ _("Search Accounting Records") }}</h4>
           <button type="button" class="close" data-dismiss="modal">&times;</button>
         </div>
 
         <!-- Modal body -->
         <div class="modal-body">
-          <label for="accounting-query">{% trans "Search:" context "Accounting|" as text %}{{ text|force_escape }}</label>
-          {% trans "e.g. Coffee" context "Accounting|" as text %}
-          <input id="accounting-query" type="text" name="q" value="{% if request.resolver_match.url_name == "search" %}{{ request.GET.q }}{% endif %}" placeholder="{{ text|force_escape }}" required="required" />
+          <label for="accounting-query">{{ _("Search:") }}</label>
+          <input id="accounting-query" type="text" name="q" value="{% if request.resolver_match.url_name == "search" %}{{ request.GET.q }}{% endif %}" placeholder="{{ _("e.g. Coffee") }}" required="required" />
         </div>
 
         <!-- Modal footer -->
         <div class="modal-footer">
           <button class="btn btn-primary" type="submit">
             <i class="fas fa-search"></i>
-            {% trans "Search" context "Accounting|" as text %}{{ text|force_escape }}
+            {{ _("Search") }}
           </button>
         </div>
       </div>
@@ -60,58 +59,48 @@ First written: 2020/7/9
       <i class="{{ current_report_icon }}"></i>
       {{ current_report_title }}
     </span>
-    <span class="d-md-none">{% trans "Book" context "Accounting|" as text %}{{ text|force_escape }}</span>
+    <span class="d-md-none">{{ _("Book") }}</span>
   </button>
   <div class="dropdown-menu account-picker">
     <a class="dropdown-item {% if request.resolver_match.url_name == "cash" %} active {% endif %}" href="{{ reports.cash }}">
       <i class="fas fa-money-bill-wave"></i>
-      {% trans "Cash Account" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Cash Account") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "cash-summary" %} active {% endif %}" href="{{ reports.cash_summary }}">
       <i class="fas fa-money-bill-wave"></i>
-      {% trans "Cash Summary" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Cash Summary") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "ledger" %} active {% endif %}" href="{{ reports.ledger }}">
       <i class="fas fa-file-invoice-dollar"></i>
-      {% trans "Ledger" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Ledger") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "ledger-summary" %} active {% endif %}" href="{{ reports.ledger_summary }}">
       <i class="fas fa-file-invoice-dollar"></i>
-      {% trans "Ledger Summary" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Ledger Summary") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "journal" %} active {% endif %}" href="{{ reports.journal }}">
       <i class="fas fa-book"></i>
-      {% trans "Journal" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Journal") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "trial-balance" %} active {% endif %}" href="{{ reports.trial_balance }}">
       <i class="fas fa-balance-scale-right"></i>
-      {% trans "Trial Balance" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Trial Balance") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "income-statement" %} active {% endif %}" href="{{ reports.income_statement }}">
       <i class="fas fa-file-invoice"></i>
-      {% trans "Income Statement" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Income Statement") }}
     </a>
     <a class="dropdown-item {% if request.resolver_match.url_name == "balance-sheet" %} active {% endif %}" href="{{ reports.balance_sheet }}">
       <i class="fas fa-balance-scale"></i>
-      {% trans "Balance Sheet" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Balance Sheet") }}
     </a>
     <span class="dropdown-item dropdown-search {% if request.resolver_match.url_name == "search" %} active {% endif %}"  data-toggle="modal" data-target="#accounting-search-modal">
       <i class="fas fa-search"></i>
-      {% trans "Search" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Search") }}
     </span>
     <a class="dropdown-item {% if request.resolver_match.url_name == "accounts" %} active {% endif %}" href="{% url "accounting:accounts" %}">
       <i class="fas fa-list-ol"></i>
-      {% trans "Accounts" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("Accounts") }}
     </a>
   </div>
 </div>
diff --git a/accounting/templates/accounting/include/summary-helper.html b/accounting/templates/accounting/include/summary-helper.html
index 32ad97e..f98f16a 100644
--- a/accounting/templates/accounting/include/summary-helper.html
+++ b/accounting/templates/accounting/include/summary-helper.html
@@ -34,7 +34,7 @@ First written: 2020/4/3
           <h4 class="modal-title">
             <label for="summary-summary">
               <i class="fas fa-edit"></i>
-              {% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}
+              {{ _("Summary") }}
             </label>
           </h4>
           <button type="button" class="close" data-dismiss="modal">&times;</button>
@@ -47,26 +47,26 @@ First written: 2020/4/3
           </div>
           <ul class="nav nav-tabs">
             <li class="nav-item">
-              <span id="summary-tab-category" class="summary-tab nav-link active">{% trans "General" context "Accounting|Summary|" as text %}{{ text|force_escape }}</span>
+              <span id="summary-tab-category" class="summary-tab nav-link active">{{ _("General") }}</span>
             </li>
             <li class="nav-item">
-              <span id="summary-tab-travel" class="summary-tab nav-link">{% trans "Travel" context "Accounting|Summary|" as text %}{{ text|force_escape }}</span>
+              <span id="summary-tab-travel" class="summary-tab nav-link">{{ _("Travel") }}</span>
             </li>
             <li class="nav-item">
-              <span id="summary-tab-bus" class="summary-tab nav-link">{% trans "Bus" context "Accounting|Summary|" as text %}{{ text|force_escape }}</span>
+              <span id="summary-tab-bus" class="summary-tab nav-link">{{ _("Bus") }}</span>
             </li>
             <li class="nav-item">
-              <span id="summary-tab-regular" class="summary-tab nav-link">{% trans "Regular" context "Accounting|Summary|" as text %}{{ text|force_escape }}</span>
+              <span id="summary-tab-regular" class="summary-tab nav-link">{{ _("Regular") }}</span>
             </li>
             <li class="nav-item">
-              <span id="summary-tab-count" class="summary-tab nav-link">{% trans "Count" context "Accounting|Summary|" as text %}{{ text|force_escape }}</span>
+              <span id="summary-tab-count" class="summary-tab nav-link">{{ _("Count") }}</span>
             </li>
           </ul>
 
           <!-- A general category -->
           <div id="summary-tab-content-category" class="summary-tab-content">
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-general-category">{% trans "Category:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-general-category">{{ _("Category:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-general-category" class="form-control summary-helper-input" type="text" value="" />
                 <div id="summary-general-categories-known" class="summary-categories-known"></div>
@@ -77,20 +77,20 @@ First written: 2020/4/3
           <!-- A general travel route -->
           <div id="summary-tab-content-travel" class="summary-tab-content d-none">
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-travel-category">{% trans "Category:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-travel-category">{{ _("Category:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-travel-category" class="form-control summary-helper-input summary-travel-part" type="text" value="" />
                 <div id="summary-travel-categories-known" class="summary-categories-known"></div>
               </div>
             </div>
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-travel-from">{% trans "From:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-travel-from">{{ _("From:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-travel-from" class="form-control summary-helper-input summary-travel-part" type="text" value="" />
               </div>
             </div>
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-travel-direction">{% trans "Direction:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-travel-direction">{{ _("Direction:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-travel-direction" class="summary-helper-input" type="hidden" value="" />
                 <span id="btn-summary-one-way" class="btn btn-outline-primary btn-summary-helper btn-summary-travel-direction"><%="→"%></span>
@@ -98,7 +98,7 @@ First written: 2020/4/3
               </div>
             </div>
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-travel-to">{% trans "To:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-travel-to">{{ _("To:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-travel-to" class="form-control summary-helper-input summary-travel-part" type="text" value="" />
               </div>
@@ -108,26 +108,26 @@ First written: 2020/4/3
           <!-- A bus route -->
           <div id="summary-tab-content-bus" class="summary-tab-content d-none">
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-bus-category">{% trans "Category:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-bus-category">{{ _("Category:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-bus-category" class="form-control summary-helper-input summary-bus-part" type="text" value="" />
                 <div id="summary-bus-categories-known" class="summary-categories-known"></div>
               </div>
             </div>
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-bus-route">{% trans "Route:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-bus-route">{{ _("Route:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-bus-route" class="form-control summary-helper-input summary-bus-part" type="text" value="" />
               </div>
             </div>
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-bus-from">{% trans "From:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-bus-from">{{ _("From:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-bus-from" class="form-control summary-helper-input summary-bus-part" type="text" value="" />
               </div>
             </div>
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-bus-to">{% trans "To:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-bus-to">{{ _("To:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-bus-to" class="form-control summary-helper-input summary-bus-part" type="text" value="" />
               </div>
@@ -145,7 +145,7 @@ First written: 2020/4/3
 
           <div id="summary-tab-content-count" class="summary-tab-content d-none">
             <div class="row">
-              <label class="col-sm-2 col-form-label" for="summary-count">{% trans "Count:" context "Accounting|Summary|" as text %}{{ text|force_escape }}</label>
+              <label class="col-sm-2 col-form-label" for="summary-count">{{ _("Count:") }}</label>
               <div class="col-sm-10">
                 <input id="summary-count" class="form-control summary-helper-input" type="number" min="1" value="" />
               </div>
diff --git a/accounting/templates/accounting/income-statement.html b/accounting/templates/accounting/income-statement.html
index e3bd9bb..dbb130e 100644
--- a/accounting/templates/accounting/income-statement.html
+++ b/accounting/templates/accounting/income-statement.html
@@ -27,7 +27,7 @@ First written: 2020/7/19
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with prep_period=period.prep_desc context "Accounting|" %}Income Statement {{ prep_period }}{% endblocktrans %}
+  {% blocktrans asvar title with prep_period=period.prep_desc %}Income Statement {{ prep_period }}{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,26 +39,21 @@ First written: 2020/7/19
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-file-invoice" %}
-    {% trans "Income Statement" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-file-invoice" current_report_title=_("Income Statement") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
@@ -82,7 +77,7 @@ First written: 2020/7/19
         <thead>
           <tr>
             <th scope="col"></th>
-            <th class="amount" colspan="2" scope="col">{% trans "Amount" context "Accounting|" as text %}{{ text|force_escape }}</th>
+            <th class="amount" colspan="2" scope="col">{{ _("Amount") }}</th>
             <th scope="col"></th>
           </tr>
         </thead>
@@ -110,13 +105,13 @@ First written: 2020/7/19
                     <td class="actions">
                       <a href="{% url "accounting:ledger" item period %}" class="btn btn-info" role="button">
                         <i class="fas fa-eye"></i>
-                        <span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
+                        <span class="d-none d-lg-inline">{{ _("View") }}</span>
                       </a>
                     </td>
                   </tr>
                 {% endfor %}
                 <tr class="total">
-                  <td><div>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</div></td>
+                  <td><div>{{ _("Total") }}</div></td>
                   <td class="amount"></td>
                   <td class="amount {% if group.amount < 0 %} text-danger {% endif %}">{{ group.amount|accounting_amount }}</td>
                   <td class="actions"></td>
@@ -124,7 +119,7 @@ First written: 2020/7/19
               {% endfor %}
             {% else %}
               <tr class="total">
-                <td><div>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</div></td>
+                <td><div>{{ _("Total") }}</div></td>
                 <td class="amount"></td>
                 <td class="amount">-</td>
                 <td class="actions"></td>
@@ -179,7 +174,7 @@ First written: 2020/7/19
                 </li>
               {% endfor %}
               <li class="list-group-item d-flex justify-content-between align-items-center total">
-                {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+                {{ _("Total") }}
                 <div class="float-right">
                   <span class="badge {% if group.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">
                     {{ group.amount|accounting_amount }}
@@ -189,7 +184,7 @@ First written: 2020/7/19
             {% endfor %}
           {% else %}
             <li class="list-group-item d-flex justify-content-between align-items-center total">
-              {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+              {{ _("Total") }}
               <div class="float-right">
                 <span class="badge {% if group.amount < 0 %} badge-danger {% else %} badge-info {% endif %} badge-pill">-</span>
               </div>
diff --git a/accounting/templates/accounting/journal.html b/accounting/templates/accounting/journal.html
index 696ac94..a0c9a10 100644
--- a/accounting/templates/accounting/journal.html
+++ b/accounting/templates/accounting/journal.html
@@ -27,7 +27,7 @@ First written: 2020/7/17
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with prep_period=period.prep_desc context "Accounting|" %}Journal {{ prep_period }}{% endblocktrans %}
+  {% blocktrans asvar title with prep_period=period.prep_desc %}Journal {{ prep_period }}{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,26 +39,21 @@ First written: 2020/7/17
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-book" %}
-    {% trans "Journal" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-book" current_report_title=_("Journal") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
@@ -77,13 +72,13 @@ First written: 2020/7/17
   <table class="table table-striped table-hover d-none d-lg-table general-journal-table">
     <thead>
       <tr>
-        <th scope="col">{% trans "Date" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Notes" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+        <th scope="col">{{ _("Date") }}</th>
+        <th scope="col">{{ _("Account") }}</th>
+        <th scope="col">{{ _("Summary") }}</th>
+        <th class="amount" scope="col">{{ _("Debit") }}</th>
+        <th class="amount" scope="col">{{ _("Credit") }}</th>
+        <th scope="col">{{ _("Notes") }}</th>
+        <th class="actions" scope="col">{{ _("View") }}</th>
       </tr>
     </thead>
     <tbody>
@@ -93,13 +88,11 @@ First written: 2020/7/17
           <td>{{ item.account.title|title_case }}</td>
           <td><div class="{% if item.is_credit %} journal-credit {% else %} journal-debit {% endif %}">{{ item.summary|default:"" }}{% if not item.is_balanced %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Unbalanced" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Unbalanced") }}
             </span>
           {% endif %}{% if item.has_order_hole %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Need Reorder" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Need Reorder") }}
             </span>
           {% endif %}</div></td>
           <td class="amount">{{ item.debit_amount|accounting_amount }}</td>
@@ -109,7 +102,7 @@ First written: 2020/7/17
             {% if item.pk is not None %}
               <a href="{% url_with_return "accounting:transactions.show" item.transaction.type item.transaction %}" class="btn btn-info" role="button">
                 <i class="fas fa-eye"></i>
-                {% trans "View" context "Accounting|" as text %}{{ text|force_escape }}
+                {{ _("View") }}
               </a>
             {% endif %}
           </td>
@@ -133,14 +126,12 @@ First written: 2020/7/17
                   {{ item.summary|default:"" }}
                   {% if not item.is_balanced %}
                     <span class="badge badge-danger badge-pill">
-                      {% trans "Unbalanced" context "Accounting|" as text %}
-                      {{ text|force_escape }}
+                      {{ _("Unbalanced") }}
                     </span>
                   {% endif %}
                   {% if item.has_order_hole %}
                     <span class="badge badge-danger badge-pill">
-                      {% trans "Need Reorder" context "Accounting|" as text %}
-                      {{ text|force_escape }}
+                      {{ _("Need Reorder") }}
                     </span>
                   {% endif %}
                 </div>
@@ -170,8 +161,7 @@ First written: 2020/7/17
                 {{ item.summary|default:"" }}
                 {% if not item.is_balanced %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Unbalanced" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Unbalanced") }}
                   </span>
                 {% endif %}
               </div>
diff --git a/accounting/templates/accounting/ledger-summary.html b/accounting/templates/accounting/ledger-summary.html
index 8d724ce..860e7fa 100644
--- a/accounting/templates/accounting/ledger-summary.html
+++ b/accounting/templates/accounting/ledger-summary.html
@@ -27,7 +27,7 @@ First written: 2020/7/16
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with account=account.title context "Accounting|" %}Ledger Summary for {{ account }}{% endblocktrans %}
+  {% blocktrans asvar title with account=account.title %}Ledger Summary for {{ account }}{% endblocktrans %}
   {% setvar "title" title %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
 {% endblock %}
@@ -38,32 +38,27 @@ First written: 2020/7/16
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-file-invoice-dollar" %}
-    {% trans "Ledger Summary" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-file-invoice-dollar" current_report_title=_("Ledger Summary") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <span class="d-none d-md-inline">{{ account.title|title_case }}</span>
-      <span class="d-md-none">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</span>
+      <span class="d-md-none">{{ _("Account") }}</span>
     </button>
     <div class="dropdown-menu account-picker">
       {% for x in accounts %}
@@ -82,12 +77,12 @@ First written: 2020/7/16
   <table class="table table-striped table-hover d-none d-sm-table general-journal-table">
     <thead>
       <tr>
-        <th scope="col">{% trans "Month" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Cumulative Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+        <th scope="col">{{ _("Month") }}</th>
+        <th class="amount" scope="col">{{ _("Debit") }}</th>
+        <th class="amount" scope="col">{{ _("Credit") }}</th>
+        <th class="amount" scope="col">{{ _("Balance") }}</th>
+        <th class="amount" scope="col">{{ _("Cumulative Balance") }}</th>
+        <th class="actions" scope="col">{{ _("View") }}</th>
       </tr>
     </thead>
     <tbody>
@@ -102,7 +97,7 @@ First written: 2020/7/16
             {% if item.month is not None %}
               <a class="btn btn-info" role="button" href="{% url "accounting:ledger" account item.month|date:"Y-m" %}">
                 <i class="fas fa-eye"></i>
-                <span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
+                <span class="d-none d-lg-inline">{{ _("View") }}</span>
               </a>
             {% endif %}
           </td>
diff --git a/accounting/templates/accounting/ledger.html b/accounting/templates/accounting/ledger.html
index cf98487..f8e71e4 100644
--- a/accounting/templates/accounting/ledger.html
+++ b/accounting/templates/accounting/ledger.html
@@ -27,7 +27,7 @@ First written: 2020/7/16
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with account=account.title prep_period=period.prep_desc context "Accounting|" %}Ledger for {{ account }} {{ prep_period }}{% endblocktrans %}
+  {% blocktrans asvar title with account=account.title prep_period=period.prep_desc %}Ledger for {{ account }} {{ prep_period }}{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,32 +39,27 @@ First written: 2020/7/16
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-file-invoice-dollar" %}
-    {% trans "Ledger" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-file-invoice-dollar" current_report_title=_("Ledger") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <span class="d-none d-md-inline">{{ account.title|title_case }}</span>
-      <span class="d-md-none">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</span>
+      <span class="d-md-none">{{ _("Account") }}</span>
     </button>
     <div class="dropdown-menu account-picker">
       {% for x in accounts %}
@@ -90,13 +85,13 @@ First written: 2020/7/16
   <table class="table table-striped table-hover d-none d-md-table general-journal-table">
     <thead>
       <tr>
-        <th scope="col">{% trans "Date" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Balance" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+        <th scope="col">{{ _("Date") }}</th>
+        <th scope="col">{{ _("Account") }}</th>
+        <th scope="col">{{ _("Summary") }}</th>
+        <th class="amount" scope="col">{{ _("Debit") }}</th>
+        <th class="amount" scope="col">{{ _("Credit") }}</th>
+        <th class="amount" scope="col">{{ _("Balance") }}</th>
+        <th class="actions" scope="col">{{ _("View") }}</th>
       </tr>
     </thead>
     <tbody>
@@ -106,23 +101,19 @@ First written: 2020/7/16
           <td>{{ item.account.title|title_case }}</td>
           <td>{{ item.summary|default:"" }}{% if not item.is_balanced %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Unbalanced" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Unbalanced") }}
             </span>
           {% endif %}{% if item.has_order_hole %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Need Reorder" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Need Reorder") }}
             </span>
           {% endif %}{% if not item.is_credit_card_paid %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Unpaid" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Unpaid") }}
             </span>
           {% endif %}{% if item.is_existing_equipment %}
             <span class="badge badge-info badge-pill">
-              {% trans "Existing" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Existing") }}
             </span>
           {% endif %}</td>
           <td class="amount">{{ item.debit_amount|accounting_amount }}</td>
@@ -132,7 +123,7 @@ First written: 2020/7/16
             {% if item.pk is not None %}
               <a href="{% url_with_return "accounting:transactions.show" item.transaction.type item.transaction %}" class="btn btn-info" role="button">
                 <i class="fas fa-eye"></i>
-                <span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
+                <span class="d-none d-lg-inline">{{ _("View") }}</span>
               </a>
             {% endif %}
           </td>
@@ -155,26 +146,22 @@ First written: 2020/7/16
                 {{ item.summary|default:"" }}
                 {% if not item.is_balanced %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Unbalanced" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Unbalanced") }}
                   </span>
                 {% endif %}
                 {% if item.has_order_hole %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Need Reorder" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Need Reorder") }}
                   </span>
                 {% endif %}
                 {% if not item.is_credit_card_paid %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Unpaid" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Unpaid") }}
                   </span>
                 {% endif %}
                 {% if item.is_existing_equipment %}
                   <span class="badge badge-info badge-pill">
-                    {% trans "Existing" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Existing") }}
                   </span>
                 {% endif %}
               </div>
diff --git a/accounting/templates/accounting/search.html b/accounting/templates/accounting/search.html
index f6bb436..0a7ac88 100644
--- a/accounting/templates/accounting/search.html
+++ b/accounting/templates/accounting/search.html
@@ -27,7 +27,7 @@ First written: 2020/7/21
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with query=request.GET.q context "Accounting|" %}Search Result for “{{ query }}”{% endblocktrans %}
+  {% blocktrans asvar title with query=request.GET.q %}Search Result for “{{ query }}”{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,26 +39,21 @@ First written: 2020/7/21
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-search" %}
-    {% trans "Search" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-search" current_report_title=_("Search") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <form class="btn btn-primary input-group" action="{% url "accounting:search" %}" method="get">
@@ -66,8 +61,7 @@ First written: 2020/7/21
     <label for="search-input" class="search-label">
       <button type="submit">
         <i class="fas fa-search"></i>
-        {% trans "Search" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Search") }}
       </button>
     </label>
   </form>
@@ -80,13 +74,13 @@ First written: 2020/7/21
   <table class="table table-striped table-hover d-none d-md-table general-journal-table">
     <thead>
       <tr>
-        <th scope="col">{% trans "Date" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="amount" scope="col">{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th scope="col">{% trans "Notes" context "Accounting|" as text %}{{ text|force_escape }}</th>
-        <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+        <th scope="col">{{ _("Date") }}</th>
+        <th scope="col">{{ _("Account") }}</th>
+        <th scope="col">{{ _("Summary") }}</th>
+        <th class="amount" scope="col">{{ _("Debit") }}</th>
+        <th class="amount" scope="col">{{ _("Credit") }}</th>
+        <th scope="col">{{ _("Notes") }}</th>
+        <th class="actions" scope="col">{{ _("View") }}</th>
       </tr>
     </thead>
     <tbody>
@@ -96,13 +90,11 @@ First written: 2020/7/21
           <td>{{ item.account.title|title_case }}</td>
           <td><div class="{% if item.is_credit %} journal-credit {% else %} journal-debit {% endif %}">{{ item.summary|default:"" }}{% if not item.is_balanced %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Unbalanced" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Unbalanced") }}
             </span>
           {% endif %}{% if item.has_order_hole %}
             <span class="badge badge-danger badge-pill">
-              {% trans "Need Reorder" context "Accounting|" as text %}
-              {{ text|force_escape }}
+              {{ _("Need Reorder") }}
             </span>
           {% endif %}</div></td>
           <td class="amount">{{ item.debit_amount|accounting_amount }}</td>
@@ -111,7 +103,7 @@ First written: 2020/7/21
           <td class="actions">
             <a href="{% url_with_return "accounting:transactions.show" item.transaction.type item.transaction %}" class="btn btn-info" role="button">
               <i class="fas fa-eye"></i>
-              {% trans "View" context "Accounting|" as text %}{{ text|force_escape }}
+              {{ _("View") }}
             </a>
           </td>
         </tr>
@@ -133,14 +125,12 @@ First written: 2020/7/21
                 {{ item.summary|default:"" }}
                 {% if not item.is_balanced %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Unbalanced" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Unbalanced") }}
                   </span>
                 {% endif %}
                 {% if item.has_order_hole %}
                   <span class="badge badge-danger badge-pill">
-                    {% trans "Need Reorder" context "Accounting|" as text %}
-                    {{ text|force_escape }}
+                    {{ _("Need Reorder") }}
                   </span>
                 {% endif %}
               </div>
diff --git a/accounting/templates/accounting/transactions/expense/form.html b/accounting/templates/accounting/transactions/expense/form.html
index e04919b..82b6293 100644
--- a/accounting/templates/accounting/transactions/expense/form.html
+++ b/accounting/templates/accounting/transactions/expense/form.html
@@ -25,8 +25,7 @@ First written: 2020/7/23
 {% load mia_core %}
 
 {% block settings %}
-  {% trans "Cash Expense Transaction" context "Accounting|" as title %}
-  {% setvar "title" title %}
+  {% setvar "title" _("Cash Expense Transaction") %}
   {% setvar "use_jqueryui" True %}
   {% static "accounting/css/transactions.css" as file %}{% add_css file %}
   {% static "accounting/css/summary-helper.css" as file %}{% add_css file %}
@@ -55,7 +54,7 @@ First written: 2020/7/23
   {% csrf_token %}
   <div class="row form-group">
     <div class="col-sm-2">
-      <label for="txn-date">{% trans "Date:" context "Accounting|" as text %}{{ text|force_escape }}</label>
+      <label for="txn-date">{{ _("Date:") }}</label>
     </div>
     <div class="col-sm-10">
       <input id="txn-date" class="form-control {% if item.date.errors %} is-invalid {% endif %}" type="date" name="date" value="{{ item.date.value }}" required="required" />
@@ -80,7 +79,7 @@ First written: 2020/7/23
         </li>
         <li class="list-group-item">
           <div class="d-flex justify-content-between align-items-center">
-            {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+            {{ _("Total") }}
             <span id="debit-total" class="amount">{{ item.debit_total }}</span>
           </div>
         </li>
@@ -90,7 +89,7 @@ First written: 2020/7/23
 
   <div class="row form-group">
     <div class="col-sm-2">
-      <label for="txn-note">{% trans "Notes:" context "Accounting|" as text %}{{ text|force_escape }}</label>
+      <label for="txn-note">{{ _("Notes:") }}</label>
     </div>
     <div class="col-sm-10">
       <textarea id="txn-note" class="form-control {% if item.notes.errors %} is-invalid {% endif %}" name="notes">{{ item.notes.value|default:"" }}</textarea>
@@ -102,7 +101,7 @@ First written: 2020/7/23
     <div class="col-sm-12">
       <button class="btn btn-primary" type="submit">
         <i class="fas fa-save"></i>
-        {% trans "Save" context "Accounting|" as text %}{{ text|force_escape }}
+        {{ _("Save") }}
       </button>
     </div>
   </div>
diff --git a/accounting/templates/accounting/transactions/expense/view.html b/accounting/templates/accounting/transactions/expense/view.html
index 036d781..d0fc502 100644
--- a/accounting/templates/accounting/transactions/expense/view.html
+++ b/accounting/templates/accounting/transactions/expense/view.html
@@ -26,8 +26,7 @@ First written: 2020/7/23
 {% load accounting %}
 
 {% block settings %}
-  {% trans "Cash Expense Transaction" context "Accounting|" as title %}
-  {% setvar "title" title %}
+  {% setvar "title" _("Cash Expense Transaction") %}
   {% static "accounting/css/transactions.css" as file %}{% add_css file %}
 {% endblock %}
 
@@ -36,7 +35,7 @@ First written: 2020/7/23
 {% if item.has_order_hole %}
   <div class="alert alert-danger alert-dismissible fade show">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <strong>{{ _("Error:") }}</strong> {% trans "The transactions on this day are not well-ordered.  Please reorder them." context "Accounting|" as text %}{{ text|force_escape }}
+    <strong>{{ _("Error:") }}</strong> {{ _("The transactions on this day are not well-ordered.  Please reorder them.") }}
   </div>
 {% endif %}
 
@@ -50,12 +49,12 @@ First written: 2020/7/23
 
         <!-- Modal Header -->
         <div class="modal-header">
-          <h4 class="modal-title">{% trans "Cash Expense Transaction Deletion Confirmation" context "Accounting|" as text %}{{ text|force_escape }}</h4>
+          <h4 class="modal-title">{{ _("Cash Expense Transaction Deletion Confirmation") }}</h4>
           <button type="button" class="close" data-dismiss="modal">&times;</button>
         </div>
 
         <!-- Modal body -->
-        <div class="modal-body">{% trans "Do you really want to delete this cash expense transaction?" context "Accounting|" as text %}{{ text|force_escape }}</div>
+        <div class="modal-body">{{ _("Do you really want to delete this cash expense transaction?") }}</div>
 
         <!-- Modal footer -->
         <div class="modal-footer">
@@ -77,7 +76,7 @@ First written: 2020/7/23
     {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
   </a>
   {% if not item.has_many_same_day %}
-    <button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{% trans "There is no other transaction at the same day." context "Accounting|" as text %}{{ text|force_escape }}">
+    <button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{{ _("There is no other transaction at the same day.") }}">
       <i class="fas fa-sort"></i>
       {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
     </button>
@@ -97,7 +96,7 @@ First written: 2020/7/23
     </button>
     <div class="dropdown-menu">
       {% if not item.has_many_same_day %}
-        <span class="dropdown-item disabled" title="{% trans "There is no other transaction at the same day." context "Accounting|" as text %}{{ text|force_escape }}">
+        <span class="dropdown-item disabled" title="{{ _("There is no other transaction at the same day.") }}">
           <i class="fas fa-sort"></i>
           {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
         </span>
@@ -120,16 +119,16 @@ First written: 2020/7/23
 </div>
 
 <div class="row">
-  <div class="col-sm-2">{% trans "Date:" context "Accounting|" as text %}{{ text|force_escape }}</div>
+  <div class="col-sm-2">{{ _("Date:") }}</div>
   <div class="col-sm-10">{{ item.date|smart_date }}</div>
 </div>
 
 <table class="table table-striped table-hover d-none d-sm-table">
   <thead>
     <tr>
-      <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-      <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-      <th class="amount" scope="col">{% trans "$" context "Accounting|" as text %}{{ text|force_escape }}</th>
+      <th scope="col">{{ _("Account") }}</th>
+      <th scope="col">{{ _("Summary") }}</th>
+      <th class="amount" scope="col">{{ _("$") }}</th>
     </tr>
   </thead>
   <tbody>
@@ -143,7 +142,7 @@ First written: 2020/7/23
   </tbody>
   <tfoot>
     <tr>
-      <td colspan="2">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+      <td colspan="2">{{ _("Total") }}</td>
       <td class="amount">{{ item.debit_total|accounting_amount }}</td>
     </tr>
   </tfoot>
@@ -161,7 +160,7 @@ First written: 2020/7/23
   {% endfor %}
   <li class="list-group-item">
     <div class="d-flex justify-content-between align-items-center account-line">
-      {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+      {{ _("Total") }}
       <span class="badge badge-info">{{ item.debit_total|accounting_amount }}</span>
     </div>
   </li>
@@ -169,7 +168,7 @@ First written: 2020/7/23
 
 {% if item.notes %}
   <div class="row">
-    <div class="col-sm-2">{% trans "Notes:" context "Accounting|" as text %}{{ text|force_escape }}</div>
+    <div class="col-sm-2">{{ _("Notes:") }}</div>
     <div class="col-sm-10">{{ item.notes }}</div>
   </div>
 {% endif %}
diff --git a/accounting/templates/accounting/transactions/income/form.html b/accounting/templates/accounting/transactions/income/form.html
index de0698d..1f02018 100644
--- a/accounting/templates/accounting/transactions/income/form.html
+++ b/accounting/templates/accounting/transactions/income/form.html
@@ -25,8 +25,7 @@ First written: 2020/7/23
 {% load mia_core %}
 
 {% block settings %}
-  {% trans "Cash Income Transaction" context "Accounting|" as title %}
-  {% setvar "title" title %}
+  {% setvar "title" _("Cash Income Transaction") %}
   {% setvar "use_jqueryui" True %}
   {% static "accounting/css/transactions.css" as file %}{% add_css file %}
   {% static "accounting/css/summary-helper.css" as file %}{% add_css file %}
@@ -55,7 +54,7 @@ First written: 2020/7/23
   {% csrf_token %}
   <div class="row form-group">
     <div class="col-sm-2">
-      <label for="txn-date">{% trans "Date:" context "Accounting|" as text %}{{ text|force_escape }}</label>
+      <label for="txn-date">{{ _("Date:") }}</label>
     </div>
     <div class="col-sm-10">
       <input id="txn-date" class="form-control {% if item.date.errors %} is-invalid {% endif %}" type="date" name="date" value="{{ item.date.value }}" required="required" />
@@ -80,7 +79,7 @@ First written: 2020/7/23
         </li>
         <li class="list-group-item">
           <div class="d-flex justify-content-between align-items-center">
-            {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+            {{ _("Total") }}
             <span id="credit-total" class="amount">{{ item.credit_total }}</span>
           </div>
         </li>
@@ -90,7 +89,7 @@ First written: 2020/7/23
 
   <div class="row form-group">
     <div class="col-sm-2">
-      <label for="txn-note">{% trans "Notes:" context "Accounting|" as text %}{{ text|force_escape }}</label>
+      <label for="txn-note">{{ _("Notes:") }}</label>
     </div>
     <div class="col-sm-10">
       <textarea id="txn-note" class="form-control {% if item.notes.errors %} is-invalid {% endif %}" name="notes">{{ item.notes.value|default:"" }}</textarea>
@@ -102,7 +101,7 @@ First written: 2020/7/23
     <div class="col-sm-12">
       <button class="btn btn-primary" type="submit">
         <i class="fas fa-save"></i>
-        {% trans "Save" context "Accounting|" as text %}{{ text|force_escape }}
+        {{ _("Save") }}
       </button>
     </div>
   </div>
diff --git a/accounting/templates/accounting/transactions/income/view.html b/accounting/templates/accounting/transactions/income/view.html
index ec6032c..3a630f6 100644
--- a/accounting/templates/accounting/transactions/income/view.html
+++ b/accounting/templates/accounting/transactions/income/view.html
@@ -26,8 +26,7 @@ First written: 2020/7/23
 {% load accounting %}
 
 {% block settings %}
-  {% trans "Cash Income Transaction" context "Accounting|" as title %}
-  {% setvar "title" title %}
+  {% setvar "title" _("Cash Income Transaction") %}
   {% static "accounting/css/transactions.css" as file %}{% add_css file %}
 {% endblock %}
 
@@ -36,7 +35,7 @@ First written: 2020/7/23
 {% if item.has_order_hole %}
   <div class="alert alert-danger alert-dismissible fade show">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <strong>{{ _("Error:") }}</strong> {% trans "The transactions on this day are not well-ordered.  Please reorder them." context "Accounting|" as text %}{{ text|force_escape }}
+    <strong>{{ _("Error:") }}</strong> {{ _("The transactions on this day are not well-ordered.  Please reorder them.") }}
   </div>
 {% endif %}
 
@@ -50,12 +49,12 @@ First written: 2020/7/23
 
         <!-- Modal Header -->
         <div class="modal-header">
-          <h4 class="modal-title">{% trans "Cash Income Transaction Deletion Confirmation" context "Accounting|" as text %}{{ text|force_escape }}</h4>
+          <h4 class="modal-title">{{ _("Cash Income Transaction Deletion Confirmation") }}</h4>
           <button type="button" class="close" data-dismiss="modal">&times;</button>
         </div>
 
         <!-- Modal body -->
-        <div class="modal-body">{% trans "Do you really want to delete this cash income transaction?" context "Accounting|" as text %}{{ text|force_escape }}</div>
+        <div class="modal-body">{{ _("Do you really want to delete this cash income transaction?") }}</div>
 
         <!-- Modal footer -->
         <div class="modal-footer">
@@ -77,7 +76,7 @@ First written: 2020/7/23
     {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
   </a>
   {% if not item.has_many_same_day %}
-    <button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{% trans "There is no other transaction at the same day." context "Accounting|" as text %}{{ text|force_escape }}">
+    <button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{{ _("There is no other transaction at the same day.") }}">
       <i class="fas fa-sort"></i>
       {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
     </button>
@@ -97,7 +96,7 @@ First written: 2020/7/23
     </button>
     <div class="dropdown-menu">
       {% if not item.has_many_same_day %}
-        <span class="dropdown-item disabled" title="{% trans "There is no other transaction at the same day." context "Accounting|" as text %}{{ text|force_escape }}">
+        <span class="dropdown-item disabled" title="{{ _("There is no other transaction at the same day.") }}">
           <i class="fas fa-sort"></i>
           {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
         </span>
@@ -120,16 +119,16 @@ First written: 2020/7/23
 </div>
 
 <div class="row">
-  <div class="col-sm-2">{% trans "Date:" context "Accounting|" as text %}{{ text|force_escape }}</div>
+  <div class="col-sm-2">{{ _("Date:") }}</div>
   <div class="col-sm-10">{{ item.date|smart_date }}</div>
 </div>
 
 <table class="table table-striped table-hover d-none d-sm-table">
   <thead>
     <tr>
-      <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-      <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-      <th class="amount" scope="col">{% trans "$" context "Accounting|" as text %}{{ text|force_escape }}</th>
+      <th scope="col">{{ _("Account") }}</th>
+      <th scope="col">{{ _("Summary") }}</th>
+      <th class="amount" scope="col">{{ _("$") }}</th>
     </tr>
   </thead>
   <tbody>
@@ -143,7 +142,7 @@ First written: 2020/7/23
   </tbody>
   <tfoot>
     <tr>
-      <td colspan="2">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+      <td colspan="2">{{ _("Total") }}</td>
       <td class="amount">{{ item.credit_total|accounting_amount }}</td>
     </tr>
   </tfoot>
@@ -161,7 +160,7 @@ First written: 2020/7/23
   {% endfor %}
   <li class="list-group-item">
     <div class="d-flex justify-content-between align-items-center account-line">
-      {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+      {{ _("Total") }}
       <span class="badge badge-info">{{ item.credit_total|accounting_amount }}</span>
     </div>
   </li>
@@ -169,7 +168,7 @@ First written: 2020/7/23
 
 {% if item.notes %}
   <div class="row">
-    <div class="col-sm-2">{% trans "Notes:" context "Accounting|" as text %}{{ text|force_escape }}</div>
+    <div class="col-sm-2">{{ _("Notes:") }}</div>
     <div class="col-sm-10">{{ item.notes }}</div>
   </div>
 {% endif %}
diff --git a/accounting/templates/accounting/transactions/transfer/form.html b/accounting/templates/accounting/transactions/transfer/form.html
index 9da87c8..83b7eb4 100644
--- a/accounting/templates/accounting/transactions/transfer/form.html
+++ b/accounting/templates/accounting/transactions/transfer/form.html
@@ -25,8 +25,7 @@ First written: 2020/7/23
 {% load mia_core %}
 
 {% block settings %}
-  {% trans "Transfer Transaction" context "Accounting|" as title %}
-  {% setvar "title" title %}
+  {% setvar "title" _("Transfer Transaction") %}
   {% setvar "use_jqueryui" True %}
   {% static "accounting/css/transactions.css" as file %}{% add_css file %}
   {% static "accounting/css/summary-helper.css" as file %}{% add_css file %}
@@ -55,7 +54,7 @@ First written: 2020/7/23
   {% csrf_token %}
   <div class="row form-group">
     <div class="col-sm-2">
-      <label for="txn-date">{% trans "Date:" context "Accounting|" as text %}{{ text|force_escape }}</label>
+      <label for="txn-date">{{ _("Date:") }}</label>
     </div>
     <div class="col-sm-10">
       <input id="txn-date" class="form-control {% if item.date.errors %} is-invalid {% endif %}" type="date" name="date" value="{{ item.date.value }}" required="required" />
@@ -65,7 +64,7 @@ First written: 2020/7/23
 
   <div class="row form-group">
     <div class="col-sm-6">
-      <h2>{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</h2>
+      <h2>{{ _("Debit") }}</h2>
 
       <ul id="debit-records" class="list-group">
         {% for record in item.debit_records %}
@@ -82,7 +81,7 @@ First written: 2020/7/23
         </li>
         <li class="list-group-item">
           <div id="debit-total-row" class="d-flex justify-content-between align-items-center form-control {% if item.balance_error %} is-invalid {% endif %} balance-row">
-            {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+            {{ _("Total") }}
             <span id="debit-total" class="amount">{{ item.debit_total }}</span>
           </div>
           <div id="debit-total-error" class="invalid-feedback balance-error">{{ item.balance_error|default:"" }}</div>
@@ -91,7 +90,7 @@ First written: 2020/7/23
     </div>
 
     <div class="col-sm-6">
-      <h2>{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</h2>
+      <h2>{{ _("Credit") }}</h2>
 
       <ul id="credit-records" class="list-group">
         {% for record in item.credit_records %}
@@ -108,7 +107,7 @@ First written: 2020/7/23
         </li>
         <li class="list-group-item">
           <div id="credit-total-row" class="d-flex justify-content-between align-items-center form-control {% if item.balance_error %} is-invalid {% endif %} balance-row">
-            {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+            {{ _("Total") }}
             <span id="credit-total" class="amount">{{ item.credit_total }}</span>
           </div>
           <div id="credit-total-error" class="invalid-feedback balance-error">{{ item.balance_error|default:"" }}</div>
@@ -119,7 +118,7 @@ First written: 2020/7/23
 
   <div class="row form-group">
     <div class="col-sm-2">
-      <label for="txn-note">{% trans "Notes:" context "Accounting|" as text %}{{ text|force_escape }}</label>
+      <label for="txn-note">{{ _("Notes:") }}</label>
     </div>
     <div class="col-sm-10">
       <textarea id="txn-note" class="form-control {% if item.notes.errors %} is-invalid {% endif %}" name="notes">{{ item.notes.value|default:"" }}</textarea>
@@ -131,7 +130,7 @@ First written: 2020/7/23
     <div class="col-sm-12">
       <button class="btn btn-primary" type="submit">
         <i class="fas fa-save"></i>
-        {% trans "Save" context "Accounting|" as text %}{{ text|force_escape }}
+        {{ _("Save") }}
       </button>
     </div>
   </div>
diff --git a/accounting/templates/accounting/transactions/transfer/view.html b/accounting/templates/accounting/transactions/transfer/view.html
index d07caa7..0e7e731 100644
--- a/accounting/templates/accounting/transactions/transfer/view.html
+++ b/accounting/templates/accounting/transactions/transfer/view.html
@@ -26,8 +26,7 @@ First written: 2020/7/23
 {% load accounting %}
 
 {% block settings %}
-  {% trans "Transfer Transaction" context "Accounting|" as title %}
-  {% setvar "title" title %}
+  {% setvar "title" _("Transfer Transaction") %}
   {% static "accounting/css/transactions.css" as file %}{% add_css file %}
 {% endblock %}
 
@@ -36,7 +35,7 @@ First written: 2020/7/23
 {% if item.has_order_hole %}
   <div class="alert alert-danger alert-dismissible fade show">
     <button type="button" class="close" data-dismiss="alert">&times;</button>
-    <strong>{{ _("Error:") }}</strong> {% trans "The transactions on this day are not well-ordered.  Please reorder them." context "Accounting|" as text %}{{ text|force_escape }}
+    <strong>{{ _("Error:") }}</strong> {{ _("The transactions on this day are not well-ordered.  Please reorder them.") }}
   </div>
 {% endif %}
 
@@ -50,12 +49,12 @@ First written: 2020/7/23
 
         <!-- Modal Header -->
         <div class="modal-header">
-          <h4 class="modal-title">{% trans "Transfer Transaction Deletion Confirmation" context "Accounting|" as text %}{{ text|force_escape }}</h4>
+          <h4 class="modal-title">{{ _("Transfer Transaction Deletion Confirmation") }}</h4>
           <button type="button" class="close" data-dismiss="modal">&times;</button>
         </div>
 
         <!-- Modal body -->
-        <div class="modal-body">{% trans "Do you really want to delete this transfer transaction?" context "Accounting|" as text %}{{ text|force_escape }}</div>
+        <div class="modal-body">{{ _("Do you really want to delete this transfer transaction?") }}</div>
 
         <!-- Modal footer -->
         <div class="modal-footer">
@@ -77,7 +76,7 @@ First written: 2020/7/23
     {% trans "Edit" context "Navigation|" as text %}{{ text|force_escape }}
   </a>
   {% if not item.has_many_same_day %}
-    <button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{% trans "There is no other transaction at the same day." context "Accounting|" as text %}{{ text|force_escape }}">
+    <button type="button" class="btn btn-secondary d-none d-sm-inline" disabled="disabled" title="{{ _("There is no other transaction at the same day.") }}">
       <i class="fas fa-sort"></i>
       {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
     </button>
@@ -93,7 +92,7 @@ First written: 2020/7/23
     </button>
     <div class="dropdown-menu">
       {% if not item.has_many_same_day %}
-        <span class="dropdown-item disabled" title="{% trans "There is no other transaction at the same day." context "Accounting|" as text %}{{ text|force_escape }}">
+        <span class="dropdown-item disabled" title="{{ _("There is no other transaction at the same day.") }}">
           <i class="fas fa-sort"></i>
           {% trans "Sort" context "Navigation|" as text %}{{ text|force_escape }}
         </span>
@@ -112,20 +111,20 @@ First written: 2020/7/23
 </div>
 
 <div class="row">
-  <div class="col-sm-2">{% trans "Date:" context "Accounting|" as text %}{{ text|force_escape }}</div>
+  <div class="col-sm-2">{{ _("Date:") }}</div>
   <div class="col-sm-10">{{ item.date|smart_date }}</div>
 </div>
 
 <div class="row">
   <div class="col-sm-6">
-    <h2>{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</h2>
+    <h2>{{ _("Debit") }}</h2>
 
     <table class="table table-striped table-hover d-none d-lg-table">
       <thead>
         <tr>
-          <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-          <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-          <th class="amount" scope="col">{% trans "$" context "Accounting|" as text %}{{ text|force_escape }}</th>
+          <th scope="col">{{ _("Account") }}</th>
+          <th scope="col">{{ _("Summary") }}</th>
+          <th class="amount" scope="col">{{ _("$") }}</th>
         </tr>
       </thead>
       <tbody>
@@ -139,7 +138,7 @@ First written: 2020/7/23
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="2">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+          <td colspan="2">{{ _("Total") }}</td>
           <td class="amount">{{ item.debit_total|accounting_amount }}</td>
         </tr>
       </tfoot>
@@ -157,7 +156,7 @@ First written: 2020/7/23
       {% endfor %}
       <li class="list-group-item">
         <div class="d-flex justify-content-between align-items-center account-line">
-          {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+          {{ _("Total") }}
           <span class="badge badge-info">{{ item.debit_total|accounting_amount }}</span>
         </div>
       </li>
@@ -165,14 +164,14 @@ First written: 2020/7/23
   </div>
 
   <div class="col-sm-6">
-    <h2>{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</h2>
+    <h2>{{ _("Credit") }}</h2>
 
     <table class="table table-striped table-hover d-none d-lg-table">
       <thead>
         <tr>
-          <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-          <th scope="col">{% trans "Summary" context "Accounting|" as text %}{{ text|force_escape }}</th>
-          <th class="amount" scope="col">{% trans "$" context "Accounting|" as text %}{{ text|force_escape }}</th>
+          <th scope="col">{{ _("Account") }}</th>
+          <th scope="col">{{ _("Summary") }}</th>
+          <th class="amount" scope="col">{{ _("$") }}</th>
         </tr>
       </thead>
       <tbody>
@@ -186,7 +185,7 @@ First written: 2020/7/23
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="2">{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+          <td colspan="2">{{ _("Total") }}</td>
           <td class="amount">{{ item.credit_total|accounting_amount }}</td>
         </tr>
       </tfoot>
@@ -205,7 +204,7 @@ First written: 2020/7/23
       {% endfor %}
       <li class="list-group-item">
         <div class="d-flex justify-content-between align-items-center account-line">
-          {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+          {{ _("Total") }}
           <span class="badge badge-info">{{ item.credit_total|accounting_amount }}</span>
         </div>
       </li>
@@ -215,7 +214,7 @@ First written: 2020/7/23
 
 {% if item.notes %}
   <div class="row">
-    <div class="col-sm-2">{% trans "Notes:" context "Accounting|" as text %}{{ text|force_escape }}</div>
+    <div class="col-sm-2">{{ _("Notes:") }}</div>
     <div class="col-sm-10">{{ item.notes }}</div>
   </div>
 {% endif %}
diff --git a/accounting/templates/accounting/trial-balance.html b/accounting/templates/accounting/trial-balance.html
index 3c61bbc..4083fc8 100644
--- a/accounting/templates/accounting/trial-balance.html
+++ b/accounting/templates/accounting/trial-balance.html
@@ -27,7 +27,7 @@ First written: 2020/7/19
 {% load accounting %}
 
 {% block settings %}
-  {% blocktrans asvar title with prep_period=period.prep_desc context "Accounting|" %}Trial Balance {{ prep_period }}{% endblocktrans %}
+  {% blocktrans asvar title with prep_period=period.prep_desc %}Trial Balance {{ prep_period }}{% endblocktrans %}
   {% setvar "title" title %}
   {% setvar "use_period_chooser" True %}
   {% static "accounting/css/report.css" as file %}{% add_css file %}
@@ -39,26 +39,21 @@ First written: 2020/7/19
   <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       <i class="fas fa-edit"></i>
-      {% trans "New" context "Accounting|" as text %}
-      {{ text|force_escape }}
+      {{ _("New")|force_escape }}
     </button>
     <div class="dropdown-menu">
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "expense" %}">
-        {% trans "Cash Expense" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Expense")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "income" %}">
-        {% trans "Cash Income" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Cash Income")|force_escape }}
       </a>
       <a class="dropdown-item" href="{% url_with_return "accounting:transactions.create" "transfer" %}">
-        {% trans "Transfer" context "Accounting|" as text %}
-        {{ text|force_escape }}
+        {{ _("Transfer")|force_escape }}
       </a>
     </div>
   </div>
-  {% with current_report_icon="fas fa-balance-scale-right" %}
-    {% trans "Trial Balance" context "Accounting|" as current_report_title %}
+  {% with current_report_icon="fas fa-balance-scale-right" current_report_title=_("Trial Balance") %}
     {% include "accounting/include/report-chooser.html" %}
   {% endwith %}
   <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#period-modal">
@@ -84,10 +79,10 @@ First written: 2020/7/19
         <table class="table table-borderless table-hover trial-balance-table">
           <thead>
             <tr>
-            <th scope="col">{% trans "Account" context "Accounting|" as text %}{{ text|force_escape }}</th>
-            <th class="amount" scope="col">{% trans "Debit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-            <th class="amount" scope="col">{% trans "Credit" context "Accounting|" as text %}{{ text|force_escape }}</th>
-            <th class="actions" scope="col">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</th>
+            <th scope="col">{{ _("Account") }}</th>
+            <th class="amount" scope="col">{{ _("Debit") }}</th>
+            <th class="amount" scope="col">{{ _("Credit") }}</th>
+            <th class="actions" scope="col">{{ _("View") }}</th>
             </tr>
           </thead>
           <tbody>
@@ -99,7 +94,7 @@ First written: 2020/7/19
                 <td class="actions">
                   <a href="{% url "accounting:ledger" item period %}" class="btn btn-info" role="button">
                     <i class="fas fa-eye"></i>
-                    <span class="d-none d-lg-inline">{% trans "View" context "Accounting|" as text %}{{ text|force_escape }}</span>
+                    <span class="d-none d-lg-inline">{{ _("View") }}</span>
                   </a>
                 </td>
               </tr>
@@ -107,7 +102,7 @@ First written: 2020/7/19
           </tbody>
           <tfoot>
             <tr>
-              <td>{% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}</td>
+              <td>{{ _("Total") }}</td>
               <td class="amount">{{ total_item.debit_amount|accounting_amount }}</td>
               <td class="amount">{{ total_item.credit_amount|accounting_amount }}</td>
               <td></td>
@@ -147,7 +142,7 @@ First written: 2020/7/19
             </li>
           {% endfor %}
           <li class="list-group-item d-flex justify-content-between align-items-center total">
-            {% trans "Total" context "Accounting|" as text %}{{ text|force_escape }}
+            {{ _("Total") }}
             <div>
               <span class="badge badge-success badge-pill">
                 {{ total_item.debit_amount|intcomma:False }}
diff --git a/accounting/utils.py b/accounting/utils.py
index fe03b20..8af6a17 100644
--- a/accounting/utils.py
+++ b/accounting/utils.py
@@ -29,7 +29,7 @@ from django.db.models import Q, Sum, Case, When, F, Count, Max, Min, Value, \
 from django.db.models.functions import StrIndex, Left
 from django.urls import reverse
 from django.utils import timezone
-from django.utils.translation import pgettext
+from django.utils.translation import gettext as _
 
 from .forms import TransactionForm, RecordForm
 from .models import Account, Transaction, Record
@@ -258,8 +258,7 @@ def get_cash_accounts():
         .order_by("code"))
     accounts.insert(0, Account(
         code="0",
-        title=pgettext(
-            "Accounting|", "current assets and liabilities"),
+        title=_("current assets and liabilities"),
     ))
     return accounts
 
diff --git a/accounting/validators.py b/accounting/validators.py
index 8dcde95..a66bcaf 100644
--- a/accounting/validators.py
+++ b/accounting/validators.py
@@ -20,7 +20,7 @@
 """
 from django.core.exceptions import ValidationError
 from django.db.models import Q
-from django.utils.translation import pgettext
+from django.utils.translation import gettext as _
 
 from .models import Account, Record
 
@@ -37,9 +37,8 @@ def validate_record_id(value):
     try:
         Record.objects.get(pk=value)
     except Record.DoesNotExist:
-        raise ValidationError(
-            pgettext("Accounting|", "This record does not exists."),
-            code="not_exist")
+        raise ValidationError(_("This record does not exists."),
+                              code="not_exist")
 
 
 def validate_record_account_code(value):
@@ -54,14 +53,12 @@ def validate_record_account_code(value):
     try:
         Account.objects.get(code=value)
     except Account.DoesNotExist:
-        raise ValidationError(
-            pgettext("Accounting|", "This account does not exist."),
-            code="not_exist")
+        raise ValidationError(_("This account does not exist."),
+                              code="not_exist")
     child = Account.objects.filter(
         Q(code__startswith=value),
         ~Q(code=value),
     ).first()
     if child is not None:
-        raise ValidationError(
-            pgettext("Accounting|", "You cannot select a parent account."),
-            code="parent_account")
+        raise ValidationError(_("You cannot select a parent account."),
+                              code="parent_account")
diff --git a/accounting/views.py b/accounting/views.py
index 019c738..5311d04 100644
--- a/accounting/views.py
+++ b/accounting/views.py
@@ -31,7 +31,7 @@ from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.decorators import method_decorator
-from django.utils.translation import pgettext, gettext_noop
+from django.utils.translation import gettext as _, gettext_noop
 from django.views.decorators.http import require_GET, require_POST
 from django.views.generic import RedirectView
 
@@ -133,7 +133,7 @@ def cash(request, account, period):
                      if len(records) > 0
                      else Transaction(date=timezone.localdate())),
         account=account,
-        summary=pgettext("Accounting|", "Total"),
+        summary=_("Total"),
     )
     record_sum.balance = balance
     record_sum.credit_amount = sum([
@@ -248,7 +248,7 @@ def cash_summary(request, account):
         cumulative_balance = cumulative_balance + month.balance
         month.cumulative_balance = cumulative_balance
     months.append(MonthlySummary(
-        label=pgettext("Accounting|", "Total"),
+        label=_("Total"),
         credit=sum([x.credit for x in months]),
         debit=sum([x.debit for x in months]),
         balance=sum([x.balance for x in months]),
@@ -319,7 +319,7 @@ def ledger(request, account, period):
         record_brought_forward = Record(
             transaction=Transaction(date=period.start),
             account=account,
-            summary=pgettext("Accounting|", "Brought Forward"),
+            summary=_("Brought Forward"),
             is_credit=balance < 0,
             amount=abs(balance),
         )
@@ -396,7 +396,7 @@ def ledger_summary(request, account):
         cumulative_balance = cumulative_balance + month.balance
         month.cumulative_balance = cumulative_balance
     months.append(MonthlySummary(
-        label=pgettext("Accounting|", "Total"),
+        label=_("Total"),
         credit=sum([x.credit for x in months]),
         debit=sum([x.debit for x in months]),
         balance=sum([x.balance for x in months]),
@@ -591,7 +591,7 @@ def trial_balance(request, period):
     accounts = nominal + real
     accounts.sort(key=lambda x: x.code)
     total_account = Account()
-    total_account.title = pgettext("Accounting|", "Total")
+    total_account.title = _("Total")
     total_account.debit_amount = sum([x.debit_amount for x in accounts
                                       if x.debit_amount is not None])
     total_account.credit_amount = sum([x.credit_amount for x in accounts
@@ -649,10 +649,10 @@ def income_statement(request, period):
         Q(code="4") | Q(code="5") | Q(code="6")
         | Q(code="7") | Q(code="8") | Q(code="9")).order_by("code"))
     cumulative_accounts = {
-        "5": Account(title=pgettext("Accounting|", "Gross Income")),
-        "6": Account(title=pgettext("Accounting|", "Operating Income")),
-        "7": Account(title=pgettext("Accounting|", "Before Tax Income")),
-        "8": Account(title=pgettext("Accounting|", "After Tax Income")),
+        "5": Account(title=_("Gross Income")),
+        "6": Account(title=_("Operating Income")),
+        "7": Account(title=_("Before Tax Income")),
+        "8": Account(title=_("After Tax Income")),
         "9": Account.objects.get(code=Account.NET_CHANGE),
     }
     cumulative_total = 0
@@ -1011,13 +1011,12 @@ def account_options(request):
         x.is_for_debit = re.match("^([1235689]|7[5678])", x.code) is not None
         x.is_for_credit = re.match("^([123489]|7[1234])", x.code) is not None
     data = {
-        "header_in_use": pgettext("Accounting|", "---Accounts In Use---"),
+        "header_in_use": _("---Accounts In Use---"),
         "debit_in_use": [x.option_data for x in accounts
                          if x.is_for_debit and x.is_in_use],
         "credit_in_use": [x.option_data for x in accounts
                           if x.is_for_credit and x.is_in_use],
-        "header_not_in_use": pgettext(
-            "Accounting|", "---Accounts Not In Use---"),
+        "header_not_in_use": _("---Accounts Not In Use---"),
         "debit_not_in_use": [x.option_data for x in accounts
                              if x.is_for_debit and not x.is_in_use],
         "credit_not_in_use": [x.option_data for x in accounts
diff --git a/mia_core/locale/zh_Hant/LC_MESSAGES/django.po b/mia_core/locale/zh_Hant/LC_MESSAGES/django.po
index 1235a26..1cfb9a4 100644
--- a/mia_core/locale/zh_Hant/LC_MESSAGES/django.po
+++ b/mia_core/locale/zh_Hant/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mia 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-06 00:00+0800\n"
-"PO-Revision-Date: 2020-08-05 23:59+0800\n"
+"POT-Creation-Date: 2020-08-06 00:39+0800\n"
+"PO-Revision-Date: 2020-08-06 00:40+0800\n"
 "Last-Translator: imacat <imacat@mail.imacat.idv.tw>\n"
 "Language-Team: Traditional Chinese <imacat@mail.imacat.idv.tw>\n"
 "Language: Traditional Chinese\n"