From edeaaef00c18fa0ed9af7111003d51e25f332b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Tue, 18 Aug 2020 00:11:32 +0800
Subject: [PATCH] Revisd the translation in the accounting application.

---
 .../locale/zh_Hant/LC_MESSAGES/django.po      | 404 +++++++++---------
 1 file changed, 198 insertions(+), 206 deletions(-)

diff --git a/accounting/locale/zh_Hant/LC_MESSAGES/django.po b/accounting/locale/zh_Hant/LC_MESSAGES/django.po
index 559f627..8a58cd0 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-accounting 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-12 23:02+0800\n"
-"PO-Revision-Date: 2020-08-12 23:03+0800\n"
+"POT-Creation-Date: 2020-08-17 23:56+0800\n"
+"PO-Revision-Date: 2020-08-18 00:02+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"
@@ -17,126 +17,126 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: accounting/converters.py:157 accounting/utils.py:246 accounting/utils.py:266
-#: accounting/utils.py:275
+#: accounting/converters.py:160 accounting/utils.py:257 accounting/utils.py:277
+#: accounting/utils.py:286
 msgid "current assets and liabilities"
 msgstr "流動資產與負債"
 
-#: accounting/forms.py:43
+#: accounting/forms.py:45
 msgid "This accounting record is not valid."
 msgstr "這筆會計分錄無效。"
 
-#: accounting/forms.py:48
+#: accounting/forms.py:50
 msgid "Please select the account."
 msgstr "請選擇會計科目。"
 
-#: accounting/forms.py:55
+#: accounting/forms.py:57
 msgid "This summary is too long (max. 128 characters)."
 msgstr "摘要太長了（最長128個字）。"
 
-#: accounting/forms.py:60
+#: accounting/forms.py:62
 msgid "Please fill in the amount."
 msgstr "請填寫金額。"
 
-#: accounting/forms.py:61 accounting/forms.py:349
+#: accounting/forms.py:63 accounting/forms.py:386
 msgid "Please fill in a number."
 msgstr "請填寫數字。"
 
-#: accounting/forms.py:62
+#: accounting/forms.py:64
 msgid "The amount must be at least 1."
 msgstr "金額要大於零。"
 
-#: accounting/forms.py:115 accounting/forms.py:122
+#: accounting/forms.py:117 accounting/forms.py:124
 msgid "This record is not for this transaction."
 msgstr "這不是這張傳票的會計分錄。"
 
-#: accounting/forms.py:136
+#: accounting/forms.py:138
 msgid "This account is not for credit records."
 msgstr "這不是貸方的會計科目。"
 
-#: accounting/forms.py:143
+#: accounting/forms.py:145
 msgid "This account is not for debit records."
 msgstr "這不是借方的會計科目。"
 
-#: accounting/forms.py:163
+#: accounting/forms.py:165
 msgid "This accounting record is not a credit record."
 msgstr "這不是貸方的會計分錄。"
 
-#: accounting/forms.py:167
+#: accounting/forms.py:169
 msgid "This accounting record is not a debit record."
 msgstr "這不是借方的會計分錄。"
 
-#: accounting/forms.py:183
+#: accounting/forms.py:185
 msgid "Please fill in the date."
 msgstr "請填寫日期。"
 
-#: accounting/forms.py:184
+#: accounting/forms.py:186
 msgid "This date is not valid."
 msgstr "請依正確日期格式填寫日期。"
 
-#: accounting/forms.py:190
+#: accounting/forms.py:192
 msgid "These notes are too long (max. 128 characters)."
 msgstr "註記太長了（最長128個字）。"
 
-#: accounting/forms.py:265
+#: accounting/forms.py:267
 msgid "Please fill in debit accounting records."
 msgstr "請填寫借方會計分錄。"
 
-#: accounting/forms.py:268 accounting/forms.py:286
+#: accounting/forms.py:270 accounting/forms.py:288
 msgid "Please fill in accounting records."
 msgstr "請填寫會計分錄。"
 
-#: accounting/forms.py:283
+#: accounting/forms.py:285
 msgid "Please fill in credit accounting records."
 msgstr "請填寫貸方會計分錄。"
 
-#: accounting/forms.py:301
+#: accounting/forms.py:303
 msgid "The total of the debit and credit amounts are inconsistent."
 msgstr "借方和貸方合計不符。"
 
-#: accounting/forms.py:348
+#: accounting/forms.py:385
 msgid "Please fill in the code."
 msgstr "請填寫代碼。"
 
-#: accounting/forms.py:350 accounting/forms.py:351
+#: accounting/forms.py:387 accounting/forms.py:388
 msgid "This code is too long  (max. 5)."
 msgstr "代碼太長了（最長5位數字）。"
 
-#: accounting/forms.py:355
+#: accounting/forms.py:392
 msgid "You can only use numbers 1-9 in the code."
 msgstr "代碼限填數字1-9。"
 
-#: accounting/forms.py:360
+#: accounting/forms.py:397
 msgid "Please fill in the title."
 msgstr "請填寫標題。"
 
-#: accounting/forms.py:361
+#: accounting/forms.py:398
 msgid "This title is too long  (max. 128)."
 msgstr "標題太長了（最長128個字）。"
 
-#: accounting/forms.py:409
+#: accounting/forms.py:447
 msgid "You cannot set the code under itself."
 msgstr "代碼不可設在自己之下。"
 
-#: accounting/forms.py:430
+#: accounting/forms.py:468
 msgid "This code is already in use."
 msgstr "代碼和其他會計科目重複。"
 
-#: accounting/forms.py:449
+#: accounting/forms.py:487
 msgid "The parent account of this code does not exist."
 msgstr "找不到上層會計科目。"
 
-#: accounting/forms.py:476
+#: accounting/forms.py:514
 msgid "The descendant account codes will be too long  (max. 5)."
 msgstr "子科目的代碼會太長（最長5位數字）。"
 
 #: accounting/templates/accounting/account_detail.html:37
-#: accounting/templates/accounting/transaction_detail-expense.html:39
-#: accounting/templates/accounting/transaction_detail-income.html:39
-#: accounting/templates/accounting/transaction_detail-transfer.html:39
-#: accounting/templates/accounting/transaction_form-expense.html:45
-#: accounting/templates/accounting/transaction_form-income.html:45
-#: accounting/templates/accounting/transaction_form-transfer.html:45
+#: accounting/templates/accounting/transaction_expense_detail.html:39
+#: accounting/templates/accounting/transaction_expense_form.html:45
+#: accounting/templates/accounting/transaction_income_detail.html:39
+#: accounting/templates/accounting/transaction_income_form.html:45
+#: accounting/templates/accounting/transaction_transfer_detail.html:39
+#: accounting/templates/accounting/transaction_transfer_form.html:45
 msgid "Error:"
 msgstr "錯誤："
 
@@ -155,29 +155,29 @@ msgstr "您真的要刪掉這個會計科目嗎？"
 
 #: accounting/templates/accounting/account_detail.html:60
 #: accounting/templates/accounting/include/summary-helper.html:158
-#: accounting/templates/accounting/transaction_detail-expense.html:62
-#: accounting/templates/accounting/transaction_detail-income.html:62
-#: accounting/templates/accounting/transaction_detail-transfer.html:62
+#: accounting/templates/accounting/transaction_expense_detail.html:62
+#: accounting/templates/accounting/transaction_income_detail.html:62
+#: accounting/templates/accounting/transaction_transfer_detail.html:62
 msgid "Confirm"
 msgstr "確定"
 
 #: accounting/templates/accounting/account_detail.html:61
 #: accounting/templates/accounting/include/summary-helper.html:159
-#: accounting/templates/accounting/transaction_detail-expense.html:63
-#: accounting/templates/accounting/transaction_detail-income.html:63
-#: accounting/templates/accounting/transaction_detail-transfer.html:63
+#: accounting/templates/accounting/transaction_expense_detail.html:63
+#: accounting/templates/accounting/transaction_income_detail.html:63
+#: accounting/templates/accounting/transaction_transfer_detail.html:63
 msgid "Cancel"
 msgstr "取消"
 
 #: accounting/templates/accounting/account_detail.html:71
 #: accounting/templates/accounting/account_form.html:42
-#: accounting/templates/accounting/transaction-sort.html:43
-#: accounting/templates/accounting/transaction_detail-expense.html:73
-#: accounting/templates/accounting/transaction_detail-income.html:73
-#: accounting/templates/accounting/transaction_detail-transfer.html:73
-#: accounting/templates/accounting/transaction_form-expense.html:52
-#: accounting/templates/accounting/transaction_form-income.html:52
-#: accounting/templates/accounting/transaction_form-transfer.html:52
+#: accounting/templates/accounting/transaction_expense_detail.html:73
+#: accounting/templates/accounting/transaction_expense_form.html:52
+#: accounting/templates/accounting/transaction_income_detail.html:73
+#: accounting/templates/accounting/transaction_income_form.html:52
+#: accounting/templates/accounting/transaction_sort_form.html:43
+#: accounting/templates/accounting/transaction_transfer_detail.html:73
+#: accounting/templates/accounting/transaction_transfer_form.html:52
 msgid "Back"
 msgstr "回上頁"
 
@@ -200,15 +200,15 @@ msgid "Ledger"
 msgstr "分類帳"
 
 #: accounting/templates/accounting/account_detail.html:107
-#: accounting/views.py:1054
+#: accounting/views.py:1012
 msgid "This account is in use."
 msgstr "會計科目使用中。"
 
 #: accounting/templates/accounting/account_detail.html:109
 #: accounting/templates/accounting/account_detail.html:114
-#: accounting/templates/accounting/transaction_detail-expense.html:118
-#: accounting/templates/accounting/transaction_detail-income.html:118
-#: accounting/templates/accounting/transaction_detail-transfer.html:110
+#: accounting/templates/accounting/transaction_expense_detail.html:118
+#: accounting/templates/accounting/transaction_income_detail.html:118
+#: accounting/templates/accounting/transaction_transfer_detail.html:110
 msgid "Delete"
 msgstr "刪除"
 
@@ -241,30 +241,30 @@ msgid "This account is an end-point account."
 msgstr "這個會計科目是最下層科目。"
 
 #: accounting/templates/accounting/account_detail.html:154
-#: accounting/templates/accounting/transaction_detail-expense.html:178
-#: accounting/templates/accounting/transaction_detail-income.html:178
-#: accounting/templates/accounting/transaction_detail-transfer.html:224
+#: accounting/templates/accounting/transaction_expense_detail.html:178
+#: accounting/templates/accounting/transaction_income_detail.html:178
+#: accounting/templates/accounting/transaction_transfer_detail.html:224
 msgid "Created at:"
 msgstr "建檔時間："
 
 #: accounting/templates/accounting/account_detail.html:159
-#: accounting/templates/accounting/transaction_detail-expense.html:183
-#: accounting/templates/accounting/transaction_detail-income.html:183
-#: accounting/templates/accounting/transaction_detail-transfer.html:229
+#: accounting/templates/accounting/transaction_expense_detail.html:183
+#: accounting/templates/accounting/transaction_income_detail.html:183
+#: accounting/templates/accounting/transaction_transfer_detail.html:229
 msgid "Created by:"
 msgstr "建檔人："
 
 #: accounting/templates/accounting/account_detail.html:164
-#: accounting/templates/accounting/transaction_detail-expense.html:188
-#: accounting/templates/accounting/transaction_detail-income.html:188
-#: accounting/templates/accounting/transaction_detail-transfer.html:234
+#: accounting/templates/accounting/transaction_expense_detail.html:188
+#: accounting/templates/accounting/transaction_income_detail.html:188
+#: accounting/templates/accounting/transaction_transfer_detail.html:234
 msgid "Updated at:"
 msgstr "更新時間："
 
 #: accounting/templates/accounting/account_detail.html:169
-#: accounting/templates/accounting/transaction_detail-expense.html:193
-#: accounting/templates/accounting/transaction_detail-income.html:193
-#: accounting/templates/accounting/transaction_detail-transfer.html:239
+#: accounting/templates/accounting/transaction_expense_detail.html:193
+#: accounting/templates/accounting/transaction_income_detail.html:193
+#: accounting/templates/accounting/transaction_transfer_detail.html:239
 msgid "Updated by:"
 msgstr "更新人："
 
@@ -273,10 +273,10 @@ msgid "Add a New Account"
 msgstr "建新會計科目"
 
 #: accounting/templates/accounting/account_form.html:81
-#: accounting/templates/accounting/transaction-sort.html:137
-#: accounting/templates/accounting/transaction_form-expense.html:115
-#: accounting/templates/accounting/transaction_form-income.html:114
-#: accounting/templates/accounting/transaction_form-transfer.html:147
+#: accounting/templates/accounting/transaction_expense_form.html:115
+#: accounting/templates/accounting/transaction_income_form.html:114
+#: accounting/templates/accounting/transaction_sort_form.html:137
+#: accounting/templates/accounting/transaction_transfer_form.html:147
 msgid "Save"
 msgstr "儲存"
 
@@ -337,21 +337,21 @@ msgstr "使用中的上層科目"
 msgid "There is currently no data."
 msgstr "目前沒有資料。"
 
-#: accounting/templates/accounting/include/record_form-non-transfer.html:32
+#: accounting/templates/accounting/include/record_form-non-transfer.html:34
 #: accounting/templates/accounting/include/record_form-transfer.html:33
-msgid "Account:"
-msgstr "科目："
-
-#: accounting/templates/accounting/include/record_form-non-transfer.html:46
-#: accounting/templates/accounting/include/record_form-transfer.html:47
 msgid "Summary:"
 msgstr "摘要："
 
-#: accounting/templates/accounting/include/record_form-non-transfer.html:51
-#: accounting/templates/accounting/include/record_form-transfer.html:52
+#: accounting/templates/accounting/include/record_form-non-transfer.html:39
+#: accounting/templates/accounting/include/record_form-transfer.html:38
 msgid "Amount:"
 msgstr "金額："
 
+#: accounting/templates/accounting/include/record_form-non-transfer.html:46
+#: accounting/templates/accounting/include/record_form-transfer.html:45
+msgid "Account:"
+msgstr "科目："
+
 #: accounting/templates/accounting/include/report-chooser.html:34
 msgid "Search Accounting Records"
 msgstr "搜尋會計帳"
@@ -415,10 +415,10 @@ msgstr "資產負債表"
 #: accounting/templates/accounting/report-journal.html:79
 #: accounting/templates/accounting/report-ledger.html:92
 #: accounting/templates/accounting/search.html:78
-#: accounting/templates/accounting/transaction_detail-expense.html:131
-#: accounting/templates/accounting/transaction_detail-income.html:131
-#: accounting/templates/accounting/transaction_detail-transfer.html:127
-#: accounting/templates/accounting/transaction_detail-transfer.html:174
+#: accounting/templates/accounting/transaction_expense_detail.html:131
+#: accounting/templates/accounting/transaction_income_detail.html:131
+#: accounting/templates/accounting/transaction_transfer_detail.html:127
+#: accounting/templates/accounting/transaction_transfer_detail.html:174
 msgid "Summary"
 msgstr "摘要"
 
@@ -497,7 +497,7 @@ msgstr "記帳"
 #: accounting/templates/accounting/report-ledger.html:46
 #: accounting/templates/accounting/report-trial-balance.html:46
 #: accounting/templates/accounting/search.html:45
-#: accounting/templates/accounting/transaction-sort.html:85
+#: accounting/templates/accounting/transaction_sort_form.html:85
 msgid "Cash Expense"
 msgstr "現金支出"
 
@@ -510,7 +510,7 @@ msgstr "現金支出"
 #: accounting/templates/accounting/report-ledger.html:49
 #: accounting/templates/accounting/report-trial-balance.html:49
 #: accounting/templates/accounting/search.html:48
-#: accounting/templates/accounting/transaction-sort.html:87
+#: accounting/templates/accounting/transaction_sort_form.html:87
 msgid "Cash Income"
 msgstr "現金收入"
 
@@ -523,7 +523,7 @@ msgstr "現金收入"
 #: accounting/templates/accounting/report-ledger.html:52
 #: accounting/templates/accounting/report-trial-balance.html:52
 #: accounting/templates/accounting/search.html:51
-#: accounting/templates/accounting/transaction-sort.html:89
+#: accounting/templates/accounting/transaction_sort_form.html:89
 msgid "Transfer"
 msgstr "轉帳"
 
@@ -550,20 +550,20 @@ msgstr "期間"
 #: accounting/templates/accounting/report-income-statement.html:189
 #: accounting/templates/accounting/report-trial-balance.html:107
 #: accounting/templates/accounting/report-trial-balance.html:147
-#: accounting/templates/accounting/transaction_detail-expense.html:146
-#: accounting/templates/accounting/transaction_detail-expense.html:164
-#: accounting/templates/accounting/transaction_detail-income.html:146
-#: accounting/templates/accounting/transaction_detail-income.html:164
-#: accounting/templates/accounting/transaction_detail-transfer.html:142
-#: accounting/templates/accounting/transaction_detail-transfer.html:160
-#: accounting/templates/accounting/transaction_detail-transfer.html:189
-#: accounting/templates/accounting/transaction_detail-transfer.html:208
-#: accounting/templates/accounting/transaction_form-expense.html:93
-#: accounting/templates/accounting/transaction_form-income.html:92
-#: accounting/templates/accounting/transaction_form-transfer.html:94
-#: accounting/templates/accounting/transaction_form-transfer.html:124
-#: accounting/views.py:134 accounting/views.py:245 accounting/views.py:388
-#: accounting/views.py:579
+#: accounting/templates/accounting/transaction_expense_detail.html:146
+#: accounting/templates/accounting/transaction_expense_detail.html:164
+#: accounting/templates/accounting/transaction_expense_form.html:93
+#: accounting/templates/accounting/transaction_income_detail.html:146
+#: accounting/templates/accounting/transaction_income_detail.html:164
+#: accounting/templates/accounting/transaction_income_form.html:92
+#: accounting/templates/accounting/transaction_transfer_detail.html:142
+#: accounting/templates/accounting/transaction_transfer_detail.html:160
+#: accounting/templates/accounting/transaction_transfer_detail.html:189
+#: accounting/templates/accounting/transaction_transfer_detail.html:208
+#: accounting/templates/accounting/transaction_transfer_form.html:94
+#: accounting/templates/accounting/transaction_transfer_form.html:124
+#: accounting/views.py:136 accounting/views.py:247 accounting/views.py:391
+#: accounting/views.py:582
 msgid "Total"
 msgstr "合計"
 
@@ -581,10 +581,10 @@ msgstr "%(account)s的現金帳摘要"
 #: accounting/templates/accounting/report-ledger.html:91
 #: accounting/templates/accounting/report-trial-balance.html:84
 #: accounting/templates/accounting/search.html:77
-#: accounting/templates/accounting/transaction_detail-expense.html:130
-#: accounting/templates/accounting/transaction_detail-income.html:130
-#: accounting/templates/accounting/transaction_detail-transfer.html:126
-#: accounting/templates/accounting/transaction_detail-transfer.html:173
+#: accounting/templates/accounting/transaction_expense_detail.html:130
+#: accounting/templates/accounting/transaction_income_detail.html:130
+#: accounting/templates/accounting/transaction_transfer_detail.html:126
+#: accounting/templates/accounting/transaction_transfer_detail.html:173
 msgid "Account"
 msgstr "科目"
 
@@ -646,7 +646,7 @@ msgstr "日期"
 #: accounting/templates/accounting/report-ledger.html:151
 #: accounting/templates/accounting/search.html:92
 #: accounting/templates/accounting/search.html:127
-#: accounting/templates/accounting/transaction-sort.html:120
+#: accounting/templates/accounting/transaction_sort_form.html:120
 msgid "Unbalanced"
 msgstr "借貸不平衡"
 
@@ -667,7 +667,7 @@ msgid "Income Statement %(prep_period)s"
 msgstr "%(prep_period)s的損益表"
 
 #: accounting/templates/accounting/report-income-statement.html:82
-#: accounting/templates/accounting/transaction-sort.html:66
+#: accounting/templates/accounting/transaction_sort_form.html:66
 msgid "Amount"
 msgstr "金額"
 
@@ -681,8 +681,8 @@ msgstr "%(prep_period)s的日記簿"
 #: accounting/templates/accounting/report-ledger.html:93
 #: accounting/templates/accounting/report-trial-balance.html:85
 #: accounting/templates/accounting/search.html:79
-#: accounting/templates/accounting/transaction_detail-transfer.html:121
-#: accounting/templates/accounting/transaction_form-transfer.html:73
+#: accounting/templates/accounting/transaction_transfer_detail.html:121
+#: accounting/templates/accounting/transaction_transfer_form.html:73
 msgid "Debit"
 msgstr "借方"
 
@@ -691,14 +691,14 @@ msgstr "借方"
 #: accounting/templates/accounting/report-ledger.html:94
 #: accounting/templates/accounting/report-trial-balance.html:86
 #: accounting/templates/accounting/search.html:80
-#: accounting/templates/accounting/transaction_detail-transfer.html:168
-#: accounting/templates/accounting/transaction_form-transfer.html:103
+#: accounting/templates/accounting/transaction_transfer_detail.html:168
+#: accounting/templates/accounting/transaction_transfer_form.html:103
 msgid "Credit"
 msgstr "貸方"
 
 #: accounting/templates/accounting/report-journal.html:82
 #: accounting/templates/accounting/search.html:81
-#: accounting/templates/accounting/transaction-sort.html:67
+#: accounting/templates/accounting/transaction_sort_form.html:67
 msgid "Notes"
 msgstr "註記"
 
@@ -732,125 +732,125 @@ msgstr "%(prep_period)s的試算表"
 msgid "Search Result for “%(query)s”"
 msgstr "「%(query)s」搜尋結果"
 
-#: accounting/templates/accounting/transaction-sort.html:30
-#, python-format
-msgid "Reorder the Transactions in %(date)s"
-msgstr "%(date)s的傳票排序"
-
-#: accounting/templates/accounting/transaction-sort.html:49
-#: accounting/templates/accounting/transaction_detail-expense.html:123
-#: accounting/templates/accounting/transaction_detail-income.html:123
-#: accounting/templates/accounting/transaction_detail-transfer.html:115
-#: accounting/templates/accounting/transaction_form-expense.html:63
-#: accounting/templates/accounting/transaction_form-income.html:63
-#: accounting/templates/accounting/transaction_form-transfer.html:63
-msgid "Date:"
-msgstr "日期："
-
-#: accounting/templates/accounting/transaction-sort.html:64
-msgid "Type"
-msgstr "類型"
-
-#: accounting/templates/accounting/transaction-sort.html:65
-msgid "Content"
-msgstr "內容"
-
-#: accounting/templates/accounting/transaction_detail-expense.html:30
-#: accounting/templates/accounting/transaction_form-expense.html:29
+#: accounting/templates/accounting/transaction_expense_detail.html:30
+#: accounting/templates/accounting/transaction_expense_form.html:29
 msgid "Cash Expense Transaction"
 msgstr "現金支出傳票"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:39
-#: accounting/templates/accounting/transaction_detail-income.html:39
-#: accounting/templates/accounting/transaction_detail-transfer.html:39
+#: accounting/templates/accounting/transaction_expense_detail.html:39
+#: accounting/templates/accounting/transaction_income_detail.html:39
+#: accounting/templates/accounting/transaction_transfer_detail.html:39
 msgid ""
 "The transactions on this day are not well-ordered.  Please reorder them."
 msgstr "這一天的傳票次序不齊，請重新排序。"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:53
+#: accounting/templates/accounting/transaction_expense_detail.html:53
 msgid "Cash Expense Transaction Deletion Confirmation"
 msgstr "現金支出傳票刪除確認"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:58
+#: accounting/templates/accounting/transaction_expense_detail.html:58
 msgid "Do you really want to delete this cash expense transaction?"
 msgstr "您真的要刪掉這張現金支出傳票嗎？"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:77
-#: accounting/templates/accounting/transaction_detail-income.html:77
-#: accounting/templates/accounting/transaction_detail-transfer.html:77
+#: accounting/templates/accounting/transaction_expense_detail.html:77
+#: accounting/templates/accounting/transaction_income_detail.html:77
+#: accounting/templates/accounting/transaction_transfer_detail.html:77
 msgid "Edit"
 msgstr "編輯"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:80
-#: accounting/templates/accounting/transaction_detail-expense.html:100
-#: accounting/templates/accounting/transaction_detail-income.html:80
-#: accounting/templates/accounting/transaction_detail-income.html:100
-#: accounting/templates/accounting/transaction_detail-transfer.html:80
-#: accounting/templates/accounting/transaction_detail-transfer.html:96
+#: accounting/templates/accounting/transaction_expense_detail.html:80
+#: accounting/templates/accounting/transaction_expense_detail.html:100
+#: accounting/templates/accounting/transaction_income_detail.html:80
+#: accounting/templates/accounting/transaction_income_detail.html:100
+#: accounting/templates/accounting/transaction_transfer_detail.html:80
+#: accounting/templates/accounting/transaction_transfer_detail.html:96
 msgid "There is no other transaction at the same day."
 msgstr "當天沒有其他會計傳票。"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:82
-#: accounting/templates/accounting/transaction_detail-expense.html:87
-#: accounting/templates/accounting/transaction_detail-expense.html:102
-#: accounting/templates/accounting/transaction_detail-expense.html:107
-#: accounting/templates/accounting/transaction_detail-income.html:82
-#: accounting/templates/accounting/transaction_detail-income.html:87
-#: accounting/templates/accounting/transaction_detail-income.html:102
-#: accounting/templates/accounting/transaction_detail-income.html:107
-#: accounting/templates/accounting/transaction_detail-transfer.html:82
-#: accounting/templates/accounting/transaction_detail-transfer.html:87
-#: accounting/templates/accounting/transaction_detail-transfer.html:98
-#: accounting/templates/accounting/transaction_detail-transfer.html:103
+#: accounting/templates/accounting/transaction_expense_detail.html:82
+#: accounting/templates/accounting/transaction_expense_detail.html:87
+#: accounting/templates/accounting/transaction_expense_detail.html:102
+#: accounting/templates/accounting/transaction_expense_detail.html:107
+#: accounting/templates/accounting/transaction_income_detail.html:82
+#: accounting/templates/accounting/transaction_income_detail.html:87
+#: accounting/templates/accounting/transaction_income_detail.html:102
+#: accounting/templates/accounting/transaction_income_detail.html:107
+#: accounting/templates/accounting/transaction_transfer_detail.html:82
+#: accounting/templates/accounting/transaction_transfer_detail.html:87
+#: accounting/templates/accounting/transaction_transfer_detail.html:98
+#: accounting/templates/accounting/transaction_transfer_detail.html:103
 msgid "Sort"
 msgstr "排序"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:92
-#: accounting/templates/accounting/transaction_detail-expense.html:112
-#: accounting/templates/accounting/transaction_detail-income.html:92
-#: accounting/templates/accounting/transaction_detail-income.html:112
+#: accounting/templates/accounting/transaction_expense_detail.html:92
+#: accounting/templates/accounting/transaction_expense_detail.html:112
+#: accounting/templates/accounting/transaction_income_detail.html:92
+#: accounting/templates/accounting/transaction_income_detail.html:112
 msgid "To Transfer"
 msgstr "改轉帳"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:132
-#: accounting/templates/accounting/transaction_detail-income.html:132
-#: accounting/templates/accounting/transaction_detail-transfer.html:128
-#: accounting/templates/accounting/transaction_detail-transfer.html:175
+#: accounting/templates/accounting/transaction_expense_detail.html:123
+#: accounting/templates/accounting/transaction_expense_form.html:63
+#: accounting/templates/accounting/transaction_income_detail.html:123
+#: accounting/templates/accounting/transaction_income_form.html:63
+#: accounting/templates/accounting/transaction_sort_form.html:49
+#: accounting/templates/accounting/transaction_transfer_detail.html:115
+#: accounting/templates/accounting/transaction_transfer_form.html:63
+msgid "Date:"
+msgstr "日期："
+
+#: accounting/templates/accounting/transaction_expense_detail.html:132
+#: accounting/templates/accounting/transaction_income_detail.html:132
+#: accounting/templates/accounting/transaction_transfer_detail.html:128
+#: accounting/templates/accounting/transaction_transfer_detail.html:175
 msgid "$"
 msgstr "$"
 
-#: accounting/templates/accounting/transaction_detail-expense.html:172
-#: accounting/templates/accounting/transaction_detail-income.html:172
-#: accounting/templates/accounting/transaction_detail-transfer.html:218
-#: accounting/templates/accounting/transaction_form-expense.html:103
-#: accounting/templates/accounting/transaction_form-income.html:102
-#: accounting/templates/accounting/transaction_form-transfer.html:135
+#: accounting/templates/accounting/transaction_expense_detail.html:172
+#: accounting/templates/accounting/transaction_expense_form.html:103
+#: accounting/templates/accounting/transaction_income_detail.html:172
+#: accounting/templates/accounting/transaction_income_form.html:102
+#: accounting/templates/accounting/transaction_transfer_detail.html:218
+#: accounting/templates/accounting/transaction_transfer_form.html:135
 msgid "Notes:"
 msgstr "註記："
 
-#: accounting/templates/accounting/transaction_detail-income.html:30
-#: accounting/templates/accounting/transaction_form-income.html:29
+#: accounting/templates/accounting/transaction_income_detail.html:30
+#: accounting/templates/accounting/transaction_income_form.html:29
 msgid "Cash Income Transaction"
 msgstr "現金收入傳票"
 
-#: accounting/templates/accounting/transaction_detail-income.html:53
+#: accounting/templates/accounting/transaction_income_detail.html:53
 msgid "Cash Income Transaction Deletion Confirmation"
 msgstr "現金收入傳票刪除確認"
 
-#: accounting/templates/accounting/transaction_detail-income.html:58
+#: accounting/templates/accounting/transaction_income_detail.html:58
 msgid "Do you really want to delete this cash income transaction?"
 msgstr "您真的要刪掉這張現金收入傳票嗎？"
 
-#: accounting/templates/accounting/transaction_detail-transfer.html:30
-#: accounting/templates/accounting/transaction_form-transfer.html:29
+#: accounting/templates/accounting/transaction_sort_form.html:30
+#, python-format
+msgid "Reorder the Transactions in %(date)s"
+msgstr "%(date)s的傳票排序"
+
+#: accounting/templates/accounting/transaction_sort_form.html:64
+msgid "Type"
+msgstr "類型"
+
+#: accounting/templates/accounting/transaction_sort_form.html:65
+msgid "Content"
+msgstr "內容"
+
+#: accounting/templates/accounting/transaction_transfer_detail.html:30
+#: accounting/templates/accounting/transaction_transfer_form.html:29
 msgid "Transfer Transaction"
 msgstr "轉帳傳票"
 
-#: accounting/templates/accounting/transaction_detail-transfer.html:53
+#: accounting/templates/accounting/transaction_transfer_detail.html:53
 msgid "Transfer Transaction Deletion Confirmation"
 msgstr "轉帳傳票刪除確認"
 
-#: accounting/templates/accounting/transaction_detail-transfer.html:58
+#: accounting/templates/accounting/transaction_transfer_detail.html:58
 msgid "Do you really want to delete this transfer transaction?"
 msgstr "您真的要刪掉這張轉帳傳票嗎？"
 
@@ -866,70 +866,62 @@ msgstr "沒有這個會計科目。"
 msgid "You cannot select a parent account."
 msgstr "請勿選擇上層會計科目。"
 
-#: accounting/views.py:313
+#: accounting/views.py:316
 msgid "Brought Forward"
 msgstr "上期結轉"
 
-#: accounting/views.py:635
+#: accounting/views.py:638
 msgid "Gross Income"
 msgstr "營業毛利"
 
-#: accounting/views.py:636
+#: accounting/views.py:639
 msgid "Operating Income"
 msgstr "營業淨利"
 
-#: accounting/views.py:637
+#: accounting/views.py:640
 msgid "Before Tax Income"
 msgstr "稅前淨利"
 
-#: accounting/views.py:638
+#: accounting/views.py:641
 msgid "After Tax Income"
 msgstr "稅後淨利"
 
-#: accounting/views.py:879
+#: accounting/views.py:822
 msgid "This transaction was not modified."
 msgstr "會計傳票未異動。"
 
-#: accounting/views.py:882
+#: accounting/views.py:823
 msgid "This transaction was saved successfully."
 msgstr "會計傳票已存檔。"
 
-#: accounting/views.py:893
+#: accounting/views.py:883
 msgid "This transaction was deleted successfully."
 msgstr "會計傳票已刪除。"
 
-#: accounting/views.py:930
-msgid "Invalid arguments."
-msgstr "參數無效。"
-
-#: accounting/views.py:932
-msgid "Invalid order."
-msgstr "次序格式錯誤。"
-
-#: accounting/views.py:946
+#: accounting/views.py:900
 msgid "The transaction orders were not modified."
 msgstr "會計傳票次序未異動。"
 
-#: accounting/views.py:952
+#: accounting/views.py:902
 msgid "The transaction orders were saved successfully."
 msgstr "會計傳票次序已儲存。"
 
-#: accounting/views.py:1033
+#: accounting/views.py:964
 msgid "This account was not modified."
 msgstr "會計科目未異動。"
 
-#: accounting/views.py:1036
+#: accounting/views.py:965
 msgid "This account was saved successfully."
 msgstr "會計科目已存檔。"
 
-#: accounting/views.py:1058
+#: accounting/views.py:1016
 msgid "This account was deleted successfully."
 msgstr "會計科目已刪除。"
 
-#: accounting/views.py:1101
+#: accounting/views.py:1059
 msgid "---Accounts In Use---"
 msgstr "-----使用中科目-----"
 
-#: accounting/views.py:1106
+#: accounting/views.py:1064
 msgid "---Accounts Not In Use---"
 msgstr "-----未使用科目-----"