X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fhomebank;a=blobdiff_plain;f=po%2Fzh_CN.po;h=2a06d4def3b2e0048ded919194eafe2543b7fee5;hp=810120618dcb48dc3abf71397637917e47e88b83;hb=160a363125e5d06f47eb22b333788097e4f01362;hpb=996fa4ab9f6b836001f8ad0eecbfd3821687fea7

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8101206..2a06d4d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,17 +2,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-07 11:54+0200\n"
-"PO-Revision-Date: 2016-10-05 00:48+0000\n"
-"Last-Translator: 陈柳云 <chenliuyun82@gmail.com>\n"
+"POT-Creation-Date: 2019-07-28 16:17+0200\n"
+"PO-Revision-Date: 2019-05-04 03:53+0000\n"
+"Last-Translator: kangkang <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2016-11-06 07:52+0000\n"
-"X-Generator: Launchpad (build 18246)\n"
+"X-Launchpad-Export-Date: 2019-07-28 14:36+0000\n"
+"X-Generator: Launchpad (build 19010)\n"
 
-#: ../data/homebank.desktop.in.in.h:1 ../src/dsp_mainwindow.c:876
+#: ../data/homebank.desktop.in.in.h:1 ../src/dsp-mainwindow.c:945
 msgid "HomeBank"
 msgstr "HomeBank"
 
@@ -20,8 +20,8 @@ msgstr "HomeBank"
 msgid "Personal finance"
 msgstr "个人理财"
 
-#: ../data/homebank.desktop.in.in.h:3 ../src/dsp_mainwindow.c:449
-#: ../src/dsp_mainwindow.c:880
+#: ../data/homebank.desktop.in.in.h:3 ../src/dsp-mainwindow.c:466
+#: ../src/dsp-mainwindow.c:949
 msgid "Free, easy, personal accounting for everyone"
 msgstr "所有人都适用的免费、方便的个人理财软件"
 
@@ -33,7 +33,7 @@ msgstr "财务，会计，预算，个人，现金"
 msgid ""
 "HomeBank is a free software (as in \"free speech\" and also as in \"free "
 "beer\") that will assist you to manage your personal accounting."
-msgstr "HomeBank是一个免费的并且能协助你管理个人账户的软件。"
+msgstr "HomeBank 是一个免费的并且能协助你管理个人账户的自由软件。"
 
 #: ../data/homebank.appdata.xml.in.h:2
 msgid ""
@@ -47,67 +47,24 @@ msgid ""
 "personal accounting then HomeBank should be the software of choice."
 msgstr "如果你正在寻找一个完全免费并且能轻松上手的个人财务管理软件，HomeBank是一个很棒的选择。"
 
-#. GTK_FILE_CHOOSER_ACTION_OPEN,
-#: ../src/dsp_account.c:338 ../src/ui-account.c:657
-#: ../src/ui-assist-import.c:939 ../src/ui-category.c:1304
-#: ../src/ui-category.c:1452 ../src/ui-currency.c:775 ../src/ui-currency.c:1043
-#: ../src/ui-dialogs.c:69 ../src/ui-dialogs.c:327 ../src/ui-dialogs.c:434
-#: ../src/ui-dialogs.c:489 ../src/ui-dialogs.c:549 ../src/ui-dialogs.c:600
-#: ../src/ui-dialogs.c:665 ../src/ui-dialogs.c:751 ../src/ui-filter.c:1270
-#: ../src/ui-hbfile.c:194 ../src/ui-payee.c:871 ../src/ui-payee.c:1032
-#: ../src/ui-pref.c:1962 ../src/ui-split.c:365 ../src/ui-transaction.c:1095
-msgid "_Cancel"
-msgstr "取消"
-
-#: ../src/dsp_account.c:340 ../src/ui-account.c:659
-#: ../src/ui-assist-import.c:941 ../src/ui-category.c:1306
-#: ../src/ui-currency.c:777 ../src/ui-currency.c:1045 ../src/ui-dialogs.c:328
-#: ../src/ui-dialogs.c:753 ../src/ui-filter.c:1272 ../src/ui-hbfile.c:196
-#: ../src/ui-payee.c:873 ../src/ui-pref.c:1964 ../src/ui-split.c:383
-#: ../src/ui-transaction.c:1096
-msgid "_OK"
-msgstr "确定(_O)"
-
-#: ../src/dsp_account.c:357
-msgid "Multiple edit transactions"
-msgstr "编辑多个交易"
-
-#: ../src/dsp_account.c:372 ../src/ui-payee.c:921 ../src/ui-transaction.c:958
-msgid "Pa_yment:"
-msgstr "支付(_y)"
-
-#: ../src/dsp_account.c:386 ../src/ui-filter.c:1027 ../src/ui-transaction.c:971
-msgid "_Info:"
-msgstr "信息(_I)："
-
-#: ../src/dsp_account.c:402 ../src/rep_time.c:1395 ../src/ui-archive.c:959
-#: ../src/ui-assign.c:840 ../src/ui-transaction.c:996
-msgid "_Payee:"
-msgstr "交易人(_P)："
-
-#: ../src/dsp_account.c:418 ../src/rep_time.c:1387 ../src/ui-archive.c:967
-#: ../src/ui-assign.c:869 ../src/ui-hbfile.c:279 ../src/ui-payee.c:913
-#: ../src/ui-transaction.c:1005
-msgid "_Category:"
-msgstr "类别(_C)："
-
-#: ../src/dsp_account.c:434 ../src/ui-transaction.c:1030
-msgid "Ta_gs:"
-msgstr "标签(_g):"
+#: ../src/dsp-account.c:206
+#, c-format
+msgid "There is %d group of similar transactions"
+msgstr ""
 
-#: ../src/dsp_account.c:450 ../src/ui-transaction.c:1022
-msgid "M_emo:"
-msgstr "备注(_e)"
+#: ../src/dsp-account.c:211
+msgid "No similar transaction were found !"
+msgstr ""
 
-#: ../src/dsp_account.c:628 ../src/dsp_account.c:638
-msgid "Check internal transfert result"
-msgstr "检查内部传输结果"
+#: ../src/dsp-account.c:293 ../src/dsp-account.c:303
+msgid "Check internal transfer result"
+msgstr ""
 
-#: ../src/dsp_account.c:629
+#: ../src/dsp-account.c:294
 msgid "No inconsistency found !"
 msgstr "没有发现不一致！"
 
-#: ../src/dsp_account.c:639
+#: ../src/dsp-account.c:304
 #, c-format
 msgid ""
 "Inconsistency were found: %d\n"
@@ -116,35 +73,35 @@ msgstr ""
 "不一致的情况出现： %d\n"
 "你想回顾并修复么？"
 
-#: ../src/dsp_account.c:696
+#: ../src/dsp-account.c:361
 #, c-format
 msgid "Every transaction amount will be divided by %.6f."
 msgstr ""
 
-#: ../src/dsp_account.c:700
+#: ../src/dsp-account.c:365
 msgid ""
 "Are you sure you want to convert this account\n"
 "to Euro as Major currency?"
-msgstr ""
+msgstr "您确定将此帐户转为欧元帐户吗？"
 
-#: ../src/dsp_account.c:702
+#: ../src/dsp-account.c:367
 msgid "_Convert"
 msgstr "转换(_C)"
 
-#: ../src/dsp_account.c:731
+#: ../src/dsp-account.c:402
 msgid "No transaction changed"
 msgstr "没有记账发生改动"
 
-#: ../src/dsp_account.c:733
+#: ../src/dsp-account.c:404
 #, c-format
 msgid "transaction changed: %d"
-msgstr ""
+msgstr "交易修改：%d"
 
-#: ../src/dsp_account.c:736
+#: ../src/dsp-account.c:407
 msgid "Automatic assignment result"
-msgstr ""
+msgstr "自动分配结果"
 
-#: ../src/dsp_account.c:917
+#: ../src/dsp-account.c:533
 msgid ""
 "Do you want to create a template with\n"
 "each of the selected transaction ?"
@@ -152,292 +109,331 @@ msgstr ""
 "为选中的每条记账\n"
 "创建模板？"
 
-#: ../src/dsp_account.c:1518
+#: ../src/dsp-account.c:534
+msgid "_Create"
+msgstr ""
+
+#: ../src/dsp-account.c:1286
 msgid ""
 "Do you want to delete\n"
 "each of the selected transaction ?"
 msgstr "你想删除选中的记账吗？"
 
-#: ../src/dsp_account.c:1607
+#: ../src/dsp-account.c:1287 ../src/ui-account.c:1041 ../src/ui-account.c:1319
+#: ../src/ui-archive.c:400 ../src/ui-archive.c:1258 ../src/ui-assign.c:556
+#: ../src/ui-assign.c:772 ../src/ui-category.c:1105 ../src/ui-category.c:1561
+#: ../src/ui-category.c:1987 ../src/ui-currency.c:1547
+#: ../src/ui-currency.c:1734 ../src/ui-payee.c:1039 ../src/ui-payee.c:1462
+#: ../src/ui-payee.c:1677 ../src/ui-tag.c:608 ../src/ui-tag.c:762
+msgid "_Delete"
+msgstr "删除"
+
+#: ../src/dsp-account.c:1350
 msgid "Are you sure you want to change the status to None?"
 msgstr ""
 
-#: ../src/dsp_account.c:1608 ../src/dsp_account.c:1670
+#: ../src/dsp-account.c:1351 ../src/dsp-account.c:1411
 msgid "Some transaction in your selection are already Reconciled."
-msgstr ""
+msgstr "你选中的选项已经一致。"
 
-#: ../src/dsp_account.c:1609 ../src/ui-assist-start.c:265
-#: ../src/ui-dialogs.c:368
+#: ../src/dsp-account.c:1352 ../src/ui-assist-start.c:287
+#: ../src/ui-dialogs.c:383
 msgid "_Change"
 msgstr "更改(_C)"
 
-#: ../src/dsp_account.c:1669
+#: ../src/dsp-account.c:1410
 msgid "Are you sure you want to toggle the status Reconciled?"
-msgstr ""
+msgstr "您确定要切换状态吗？"
 
-#: ../src/dsp_account.c:1671
+#: ../src/dsp-account.c:1412
 msgid "_Toggle"
-msgstr ""
+msgstr "切换(_T)"
 
-#: ../src/dsp_account.c:1912
+#. label = g_strdup_printf(_("Account %d of %d"), acckey+1, nbacc);
+#. gtk_label_set_markup (GTK_LABEL(txndata->LB_acc_count), label);
+#. g_free(label);
+#: ../src/dsp-account.c:1704 ../src/ui-assist-import.c:1288
 #, c-format
-msgid "%d items (%s)"
-msgstr "%d 项目(%s)"
+msgid "%d transactions"
+msgstr ""
 
-#. TRANSLATORS: detail of the 3 %s which are some amount of selected transaction, 1=total 2=income, 3=expense
-#. msg = g_strdup_printf (_("transaction selected: %d, hidden: %d / %s ( %s - %s)"), count, data->hidden, buf3, buf1, buf2);
-#: ../src/dsp_account.c:1917
+#: ../src/dsp-account.c:1707
 #, c-format
-msgid "%d items (%d selected %s)"
-msgstr "%d项目(%d选中%s)"
+msgid "%d transactions, %d selected, avg: %s, sum: %s (%s - %s)"
+msgstr ""
+
+#: ../src/dsp-account.c:1806 ../src/dsp-account.c:2064
+msgid "All transactions"
+msgstr ""
 
 #. name, icon-name, label
-#: ../src/dsp_account.c:2157
+#: ../src/dsp-account.c:1923
 msgid "A_ccount"
-msgstr ""
+msgstr "账户(_C)："
 
-#: ../src/dsp_account.c:2158
+#: ../src/dsp-account.c:1924
 msgid "Transacti_on"
 msgstr "è®°è´¦(_O)"
 
-#: ../src/dsp_account.c:2159
+#: ../src/dsp-account.c:1925
 msgid "_Status"
 msgstr "状态(_S)"
 
-#: ../src/dsp_account.c:2160 ../src/dsp_mainwindow.c:165
+#: ../src/dsp-account.c:1926 ../src/dsp-mainwindow.c:166
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../src/dsp_account.c:2162 ../src/dsp_mainwindow.c:180
-#: ../src/dsp_mainwindow.c:866 ../src/ui-account.c:1187
-#: ../src/ui-archive.c:1086 ../src/ui-assign.c:717 ../src/ui-budget.c:996
-#: ../src/ui-category.c:1816 ../src/ui-currency.c:1464 ../src/ui-dialogs.c:179
-#: ../src/ui-payee.c:1222 ../src/ui-transaction.c:1104
-#: ../src/ui-transaction.c:1112
-msgid "_Close"
-msgstr "关闭(_C)"
+#. name, icon-name, label, accelerator, tooltip
+#: ../src/dsp-account.c:1930
+msgid "Export as PDF..."
+msgstr ""
 
-#: ../src/dsp_account.c:2162
-msgid "Close the current account"
-msgstr "关闭当前账户"
+#: ../src/dsp-account.c:1930
+msgid "Export to a PDF file"
+msgstr ""
 
-#. name, icon-name, label, accelerator, tooltip
-#: ../src/dsp_account.c:2165
-msgid "_Filter..."
-msgstr "过滤(_F)..."
+#: ../src/dsp-account.c:1931
+msgid "Export QIF..."
+msgstr "导出为 QIF"
 
-#: ../src/dsp_account.c:2165
-msgid "Open the list filter"
-msgstr "打开列表过滤"
+#: ../src/dsp-account.c:1931 ../src/ui-dialogs.c:448
+msgid "Export as QIF"
+msgstr "导出为 QIF"
 
-#: ../src/dsp_account.c:2166
-msgid "Convert to Euro..."
-msgstr ""
+#: ../src/dsp-account.c:1932
+msgid "Export CSV..."
+msgstr "导出 CSV..."
 
-#: ../src/dsp_account.c:2166
-msgid "Convert this account to Euro currency"
-msgstr ""
+#: ../src/dsp-account.c:1932 ../src/rep-vehicle.c:67 ../src/ui-dialogs.c:504
+msgid "Export as CSV"
+msgstr "导出为 CSV 格式"
+
+#: ../src/dsp-account.c:1933 ../src/dsp-mainwindow.c:183
+#: ../src/dsp-mainwindow.c:935 ../src/ui-account.c:1261
+#: ../src/ui-archive.c:1193 ../src/ui-assign.c:720 ../src/ui-budget.c:995
+#: ../src/ui-category.c:1805 ../src/ui-currency.c:1658 ../src/ui-dialogs.c:183
+#: ../src/ui-payee.c:1550 ../src/ui-tag.c:681 ../src/ui-transaction.c:1143
+#: ../src/ui-transaction.c:1151
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: ../src/dsp-account.c:1933
+msgid "Close the current account"
+msgstr "关闭当前账户"
 
-#: ../src/dsp_account.c:2168
+#: ../src/dsp-account.c:1935
 msgid "_Add..."
 msgstr "添加(_A)..."
 
-#: ../src/dsp_account.c:2168
+#: ../src/dsp-account.c:1935
 msgid "Add a new transaction"
-msgstr "添加一个新的记账"
+msgstr "添加一个新的记账文件"
 
-#: ../src/dsp_account.c:2169
+#: ../src/dsp-account.c:1936
 msgid "_Inherit..."
 msgstr "套用(_I)..."
 
-#: ../src/dsp_account.c:2169
+#: ../src/dsp-account.c:1936
 msgid "Inherit from the active transaction"
 msgstr "套用选中的记账"
 
-#: ../src/dsp_account.c:2170
+#: ../src/dsp-account.c:1937
 msgid "_Edit..."
 msgstr "编辑(_E)..."
 
-#: ../src/dsp_account.c:2170
+#: ../src/dsp-account.c:1937
 msgid "Edit the active transaction"
 msgstr "编辑选中的记账"
 
-#: ../src/dsp_account.c:2172
+#: ../src/dsp-account.c:1939
 msgid "_None"
 msgstr "无"
 
-#: ../src/dsp_account.c:2172
+#: ../src/dsp-account.c:1939
 msgid "Toggle none for selected transaction(s)"
 msgstr ""
 
-#: ../src/dsp_account.c:2173
+#: ../src/dsp-account.c:1940
 msgid "_Cleared"
 msgstr ""
 
-#: ../src/dsp_account.c:2173
+#: ../src/dsp-account.c:1940
 msgid "Toggle cleared for selected transaction(s)"
 msgstr ""
 
-#: ../src/dsp_account.c:2174
+#: ../src/dsp-account.c:1941
 msgid "_Reconciled"
 msgstr "已对账(_R)"
 
-#: ../src/dsp_account.c:2174
+#: ../src/dsp-account.c:1941
 msgid "Toggle reconciled for selected transaction(s)"
 msgstr ""
 
-#: ../src/dsp_account.c:2176
+#: ../src/dsp-account.c:1943
 msgid "_Multiple Edit..."
 msgstr ""
 
-#: ../src/dsp_account.c:2176
+#: ../src/dsp-account.c:1943
 msgid "Edit multiple transaction"
-msgstr ""
+msgstr "编辑多个交易选项"
 
-#: ../src/dsp_account.c:2177
+#: ../src/dsp-account.c:1944
 msgid "Create template..."
 msgstr "创建模板..."
 
-#: ../src/dsp_account.c:2177
+#: ../src/dsp-account.c:1944
 msgid "Create template"
 msgstr "创建模板"
 
-#: ../src/dsp_account.c:2178
+#: ../src/dsp-account.c:1945
 msgid "_Delete..."
 msgstr "删除(_D)..."
 
-#: ../src/dsp_account.c:2178
+#: ../src/dsp-account.c:1945
 msgid "Delete selected transaction(s)"
 msgstr "删除所选交易"
 
-#: ../src/dsp_account.c:2180
+#: ../src/dsp-account.c:1947
+msgid "Mark duplicate..."
+msgstr ""
+
+#. { "DuplicateClear", NULL                      , N_("Unmark duplicate"), NULL,	NULL, G_CALLBACK (register_panel_action_duplicate_unmark) },
+#: ../src/dsp-account.c:1950
+msgid "Check internal xfer"
+msgstr ""
+
+#: ../src/dsp-account.c:1951
 msgid "Auto. assignments"
 msgstr ""
 
-#: ../src/dsp_account.c:2180
+#: ../src/dsp-account.c:1951
 msgid "Run automatic assignments"
 msgstr ""
 
-#: ../src/dsp_account.c:2181
-msgid "Export QIF..."
-msgstr "导出为 QIF"
+#: ../src/dsp-account.c:1953
+msgid "_Filter..."
+msgstr "过滤(_F)..."
 
-#: ../src/dsp_account.c:2181 ../src/ui-dialogs.c:431
-msgid "Export as QIF"
-msgstr "导出为 QIF"
+#: ../src/dsp-account.c:1953
+msgid "Open the list filter"
+msgstr "打开列表过滤"
 
-#: ../src/dsp_account.c:2182
-msgid "Export CSV..."
-msgstr "导出 CSV..."
+#: ../src/dsp-account.c:1954
+msgid "Convert to Euro..."
+msgstr "兑换成欧元…"
 
-#: ../src/dsp_account.c:2182 ../src/rep_budget.c:84 ../src/rep_stats.c:72
-#: ../src/rep_time.c:73 ../src/rep_vehicle.c:67 ../src/ui-dialogs.c:481
-msgid "Export as CSV"
-msgstr "导出为 CSV 格式"
+#: ../src/dsp-account.c:1954
+msgid "Convert this account to Euro currency"
+msgstr "把这个账户转换成欧元帐户"
+
+#: ../src/dsp-account.c:2057
+msgid "(closed)"
+msgstr ""
 
-#: ../src/dsp_account.c:2184
-msgid "Check internal xfer..."
+#: ../src/dsp-account.c:2064
+#, c-format
+msgid "%s - HomeBank"
 msgstr ""
 
-#: ../src/dsp_account.c:2317 ../src/dsp_mainwindow.c:2574
+#: ../src/dsp-account.c:2096 ../src/dsp-mainwindow.c:1995 ../src/ui-split.c:824
 msgid "Add"
 msgstr "添加"
 
-#: ../src/dsp_account.c:2320
+#: ../src/dsp-account.c:2099
 msgid "Inherit"
 msgstr "套用"
 
-#: ../src/dsp_account.c:2323
+#: ../src/dsp-account.c:2102 ../src/ui-split.c:786
 msgid "Edit"
 msgstr "编辑"
 
-#: ../src/dsp_account.c:2326 ../src/rep_stats.c:69
+#: ../src/dsp-account.c:2105 ../src/rep-stats.c:72
 msgid "Filter"
 msgstr "过滤"
 
+#. info bar for duplicate
+#: ../src/dsp-account.c:2142
+msgid "_Refresh"
+msgstr "刷新(_R)"
+
 #. balances area
-#: ../src/dsp_account.c:2377
+#: ../src/dsp-account.c:2177
 msgid "Bank:"
 msgstr "余额"
 
-#: ../src/dsp_account.c:2383
+#: ../src/dsp-account.c:2183
 msgid "Today:"
 msgstr "今天："
 
-#: ../src/dsp_account.c:2389
+#: ../src/dsp-account.c:2189
 msgid "Future:"
 msgstr "将来："
 
-#: ../src/dsp_account.c:2415 ../src/rep_balance.c:874 ../src/rep_budget.c:1125
-#: ../src/rep_stats.c:1553 ../src/rep_time.c:1442 ../src/rep_vehicle.c:748
+#: ../src/dsp-account.c:2212 ../src/rep-balance.c:942 ../src/rep-budget.c:1191
+#: ../src/rep-stats.c:1543 ../src/rep-time.c:1274 ../src/rep-vehicle.c:755
+#: ../src/ui-pref.c:1284 ../src/ui-pref.c:1639 ../src/ui-pref.c:2018
 msgid "_Range:"
 msgstr "范围(_R)："
 
-#: ../src/dsp_account.c:2420 ../src/ui-account.c:1275
-#: ../src/ui-assist-start.c:376
+#: ../src/dsp-account.c:2220
+msgid "Toggle show future transaction"
+msgstr ""
+
+#: ../src/dsp-account.c:2224 ../src/rep-budget.c:1166 ../src/rep-stats.c:1501
+#: ../src/ui-account.c:1349 ../src/ui-assist-start.c:398
 msgid "_Type:"
 msgstr "类型(_T)："
 
-#: ../src/dsp_account.c:2425 ../src/ui-archive.c:975
-#: ../src/ui-transaction.c:1014
+#: ../src/dsp-account.c:2229 ../src/ui-archive.c:1069
+#: ../src/ui-transaction.c:1304
 msgid "_Status:"
 msgstr "状态(_S)："
 
-#: ../src/dsp_account.c:2430
-msgid "Reset _filters"
-msgstr ""
+#. widget = gtk_button_new_with_mnemonic (_("Reset _filters"));
+#: ../src/dsp-account.c:2235 ../src/ui-filter.c:1405 ../src/ui-pref.c:2115
+#: ../src/ui-pref.c:2136
+msgid "_Reset"
+msgstr "重置(_R)"
 
 #. TRANSLATORS: this is for Euro specific users, a toggle to display in 'Minor' currency
-#: ../src/dsp_account.c:2435 ../src/rep_balance.c:853 ../src/rep_budget.c:1112
-#: ../src/rep_stats.c:1524 ../src/rep_time.c:1420 ../src/rep_vehicle.c:735
+#: ../src/dsp-account.c:2240 ../src/rep-balance.c:921 ../src/rep-budget.c:1178
+#: ../src/rep-stats.c:1515 ../src/rep-time.c:1253 ../src/rep-vehicle.c:742
 msgid "Euro _minor"
-msgstr ""
-
-#. header
-#: ../src/dsp_mainwindow.c:148 ../src/dsp_mainwindow.c:2561
-#: ../src/list_operation.c:52 ../src/list_operation.c:1127
-#: ../src/list_operation.c:1382 ../src/rep_budget.c:70 ../src/rep_budget.c:400
-#: ../src/rep_budget.c:1503 ../src/rep_stats.c:141 ../src/rep_time.c:121
-#: ../src/ui-budget.c:243 ../src/ui-dialogs.c:234 ../src/ui-filter.c:1327
-#: ../src/ui-split.c:406
-msgid "Category"
-msgstr "类别"
-
-#: ../src/dsp_mainwindow.c:149 ../src/rep_budget.c:70 ../src/rep_stats.c:142
-msgid "Subcategory"
-msgstr "子类别"
+msgstr "欧元设置"
 
 #. name, icon-name, label
-#: ../src/dsp_mainwindow.c:158
+#: ../src/dsp-mainwindow.c:158
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/dsp_mainwindow.c:159
-msgid "_Import"
-msgstr "导入(_I)"
+#. { "ImportMenu" , NULL, N_("_Import"), NULL, NULL, NULL },
+#: ../src/dsp-mainwindow.c:160
+msgid "Open _Recent"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:160 ../src/ui-category.c:1985
-#: ../src/ui-currency.c:1535 ../src/ui-payee.c:1313
+#. todo: useless ?
+#: ../src/dsp-mainwindow.c:161 ../src/ui-category.c:1981
+#: ../src/ui-currency.c:1730 ../src/ui-payee.c:1671 ../src/ui-tag.c:759
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/dsp_mainwindow.c:161
+#: ../src/dsp-mainwindow.c:162
 msgid "_View"
 msgstr "视图(_V)"
 
-#: ../src/dsp_mainwindow.c:162
+#: ../src/dsp-mainwindow.c:163
 msgid "_Manage"
 msgstr "管理(_M)"
 
-#: ../src/dsp_mainwindow.c:163
+#: ../src/dsp-mainwindow.c:164
 msgid "_Transactions"
 msgstr "è®°è´¦(_T)"
 
-#: ../src/dsp_mainwindow.c:164
+#: ../src/dsp-mainwindow.c:165
 msgid "_Reports"
 msgstr "报表(_R)"
 
-#: ../src/dsp_mainwindow.c:166
+#: ../src/dsp-mainwindow.c:167
 msgid "_Help"
 msgstr "帮助(_H)"
 
@@ -445,310 +441,345 @@ msgstr "帮助(_H)"
 #. { "Export"       , NULL, N_("Export to") },
 #. name, icon-name, label, accelerator, tooltip
 #. FileMenu
-#: ../src/dsp_mainwindow.c:173
+#: ../src/dsp-mainwindow.c:174
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../src/dsp_mainwindow.c:173
+#: ../src/dsp-mainwindow.c:174
 msgid "Create a new file"
 msgstr "新建文件"
 
-#: ../src/dsp_mainwindow.c:174
+#: ../src/dsp-mainwindow.c:175
 msgid "_Open..."
 msgstr "打开(_O)..."
 
-#: ../src/dsp_mainwindow.c:174 ../src/dsp_mainwindow.c:2634
+#: ../src/dsp-mainwindow.c:175 ../src/dsp-mainwindow.c:2049
 msgid "Open a file"
 msgstr "打开文件"
 
-#: ../src/dsp_mainwindow.c:175 ../src/ui-dialogs.c:435 ../src/ui-dialogs.c:482
-#: ../src/ui-dialogs.c:543 ../src/ui-dialogs.c:666
+#: ../src/dsp-mainwindow.c:176 ../src/ui-dialogs.c:452 ../src/ui-dialogs.c:505
+#: ../src/ui-dialogs.c:572 ../src/ui-dialogs.c:723
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/dsp_mainwindow.c:175
+#: ../src/dsp-mainwindow.c:176
 msgid "Save the current file"
 msgstr "保存当前文件"
 
-#: ../src/dsp_mainwindow.c:176
+#: ../src/dsp-mainwindow.c:177
 msgid "Save _As..."
-msgstr ""
+msgstr "另存为..."
 
-#: ../src/dsp_mainwindow.c:176
+#: ../src/dsp-mainwindow.c:177
 msgid "Save the current file with a different name"
 msgstr "用其它文件名保存当前文件"
 
-#: ../src/dsp_mainwindow.c:177
+#: ../src/dsp-mainwindow.c:179
 msgid "Revert"
 msgstr "恢复"
 
-#: ../src/dsp_mainwindow.c:177
+#: ../src/dsp-mainwindow.c:179
 msgid "Revert to a saved version of this file"
 msgstr "取消当前的修改,恢复到上一次保存的状态"
 
-#: ../src/dsp_mainwindow.c:179
-msgid "Properties..."
+#: ../src/dsp-mainwindow.c:180
+msgid "Restore backup"
+msgstr ""
+
+#: ../src/dsp-mainwindow.c:180
+msgid "Restore from a backup file"
 msgstr ""
 
-#: ../src/dsp_mainwindow.c:179
+#: ../src/dsp-mainwindow.c:182
+msgid "Properties..."
+msgstr "属性…"
+
+#: ../src/dsp-mainwindow.c:182
 msgid "Configure the file"
 msgstr "配置此文件"
 
-#: ../src/dsp_mainwindow.c:180
+#: ../src/dsp-mainwindow.c:183
 msgid "Close the current file"
 msgstr "关闭当前文件"
 
-#: ../src/dsp_mainwindow.c:181
+#: ../src/dsp-mainwindow.c:184
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/dsp_mainwindow.c:181
+#: ../src/dsp-mainwindow.c:184
 msgid "Quit HomeBank"
-msgstr ""
+msgstr "退出 HomeBank"
 
 #. Exchange
-#: ../src/dsp_mainwindow.c:184
-msgid "QIF file..."
-msgstr "QIF 格式"
+#: ../src/dsp-mainwindow.c:187
+msgid "Import..."
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:184 ../src/dsp_mainwindow.c:185
-#: ../src/dsp_mainwindow.c:186
+#: ../src/dsp-mainwindow.c:187
 msgid "Open the import assistant"
 msgstr "打开导入向导"
 
-#: ../src/dsp_mainwindow.c:185
-msgid "OFX/QFX file..."
-msgstr "OFX/QFX 格式"
-
-#: ../src/dsp_mainwindow.c:186
-msgid "CSV file..."
-msgstr "CSV 格式"
-
-#: ../src/dsp_mainwindow.c:188
-msgid "Export QIF file..."
-msgstr "导出为 QIF 格式"
+#. { "ImportQIF" , ICONNAME_HB_FILE_IMPORT  , N_("QIF file...")     , NULL, N_("Open the import assistant"),    G_CALLBACK (ui_mainwindow_action_import) },
+#. { "ImportOFX" , ICONNAME_HB_FILE_IMPORT  , N_("OFX/QFX file...")     , NULL, N_("Open the import assistant"),    G_CALLBACK (ui_mainwindow_action_import) },
+#. { "ImportCSV" , ICONNAME_HB_FILE_IMPORT  , N_("CSV file...")     , NULL, N_("Open the import assistant"),    G_CALLBACK (ui_mainwindow_action_import) },
+#: ../src/dsp-mainwindow.c:192
+msgid "Export as QIF..."
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:188
+#: ../src/dsp-mainwindow.c:192
 msgid "Export all account in a QIF file"
 msgstr "导出所有账户到 QIF 文件"
 
 #. EditMenu
-#: ../src/dsp_mainwindow.c:191
+#: ../src/dsp-mainwindow.c:195
 msgid "Preferences..."
 msgstr "首选项..."
 
-#: ../src/dsp_mainwindow.c:191
+#: ../src/dsp-mainwindow.c:195
 msgid "Configure HomeBank"
-msgstr ""
+msgstr "配置 HomeBank"
 
 #. ManageMenu
-#: ../src/dsp_mainwindow.c:194
+#: ../src/dsp-mainwindow.c:198
 msgid "Currencies..."
-msgstr ""
+msgstr "货币…"
 
-#: ../src/dsp_mainwindow.c:194
+#: ../src/dsp-mainwindow.c:198
 msgid "Configure the currencies"
-msgstr ""
+msgstr "配置货币"
 
-#: ../src/dsp_mainwindow.c:195
+#: ../src/dsp-mainwindow.c:199
 msgid "Acc_ounts..."
 msgstr "账户(_O)"
 
-#: ../src/dsp_mainwindow.c:195
+#: ../src/dsp-mainwindow.c:199
 msgid "Configure the accounts"
 msgstr "管理账户"
 
-#: ../src/dsp_mainwindow.c:196
+#: ../src/dsp-mainwindow.c:200
 msgid "_Payees..."
 msgstr "交易人(_P)..."
 
-#: ../src/dsp_mainwindow.c:196
+#: ../src/dsp-mainwindow.c:200
 msgid "Configure the payees"
 msgstr "管理交易人"
 
-#: ../src/dsp_mainwindow.c:197
+#: ../src/dsp-mainwindow.c:201
 msgid "Categories..."
 msgstr "类别..."
 
-#: ../src/dsp_mainwindow.c:197
+#: ../src/dsp-mainwindow.c:201
 msgid "Configure the categories"
 msgstr "管理类别"
 
-#: ../src/dsp_mainwindow.c:198
+#: ../src/dsp-mainwindow.c:202
 msgid "Scheduled/Template..."
 msgstr "计划/模板..."
 
-#: ../src/dsp_mainwindow.c:198
+#: ../src/dsp-mainwindow.c:202
 msgid "Configure the scheduled/template transactions"
 msgstr "配置此计划/模板记账"
 
-#: ../src/dsp_mainwindow.c:199
+#: ../src/dsp-mainwindow.c:203
 msgid "Budget..."
 msgstr "预算..."
 
-#: ../src/dsp_mainwindow.c:199
+#: ../src/dsp-mainwindow.c:203
 msgid "Configure the budget"
 msgstr "管理预算"
 
-#: ../src/dsp_mainwindow.c:200
+#: ../src/dsp-mainwindow.c:204
 msgid "Assignments..."
 msgstr "归类..."
 
-#: ../src/dsp_mainwindow.c:200
+#: ../src/dsp-mainwindow.c:204
 msgid "Configure the automatic assignments"
 msgstr "管理自动归类"
 
+#: ../src/dsp-mainwindow.c:205
+msgid "Tags..."
+msgstr ""
+
+#: ../src/dsp-mainwindow.c:205
+msgid "Configure the tags"
+msgstr ""
+
 #. TxnMenu
-#: ../src/dsp_mainwindow.c:203
+#: ../src/dsp-mainwindow.c:208
+msgid "Add..."
+msgstr "添加..."
+
+#: ../src/dsp-mainwindow.c:208
+msgid "Add transactions"
+msgstr "添加交易"
+
+#: ../src/dsp-mainwindow.c:209
 msgid "Show..."
 msgstr "显示..."
 
-#: ../src/dsp_mainwindow.c:203
+#: ../src/dsp-mainwindow.c:209
 msgid "Shows selected account transactions"
 msgstr "显示选中的帐户记账"
 
-#: ../src/dsp_mainwindow.c:204
-msgid "Add..."
-msgstr "添加..."
+#. beware ShowAllTxn is used to detect showall
+#: ../src/dsp-mainwindow.c:211
+msgid "Show all..."
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:204
-msgid "Add transactions"
-msgstr "添加交易"
+#: ../src/dsp-mainwindow.c:211
+msgid "Shows all account transactions"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:205
+#: ../src/dsp-mainwindow.c:212
 msgid "Set scheduler..."
 msgstr "设置计划..."
 
-#: ../src/dsp_mainwindow.c:205
+#: ../src/dsp-mainwindow.c:212
 msgid "Configure the transaction scheduler"
 msgstr "配置记账计划"
 
-#: ../src/dsp_mainwindow.c:206
+#: ../src/dsp-mainwindow.c:213
 msgid "Post scheduled"
 msgstr ""
 
-#: ../src/dsp_mainwindow.c:206 ../src/ui-pref.c:1776
+#: ../src/dsp-mainwindow.c:213 ../src/ui-pref.c:1998
 msgid "Post pending scheduled transactions"
-msgstr ""
+msgstr "待定交易"
 
 #. ReportMenu
-#: ../src/dsp_mainwindow.c:209
+#: ../src/dsp-mainwindow.c:216
 msgid "_Statistics..."
 msgstr "统计(_S)..."
 
-#: ../src/dsp_mainwindow.c:209
+#: ../src/dsp-mainwindow.c:216
 msgid "Open the Statistics report"
 msgstr "打开统计报表"
 
-#: ../src/dsp_mainwindow.c:210
+#: ../src/dsp-mainwindow.c:217
 msgid "_Trend Time..."
 msgstr "走势(_T)..."
 
-#: ../src/dsp_mainwindow.c:210
+#: ../src/dsp-mainwindow.c:217
 msgid "Open the Trend Time report"
 msgstr "打开走势报表"
 
-#: ../src/dsp_mainwindow.c:211
+#: ../src/dsp-mainwindow.c:218
 msgid "B_udget..."
 msgstr "预算(_U)..."
 
-#: ../src/dsp_mainwindow.c:211
+#: ../src/dsp-mainwindow.c:218
 msgid "Open the Budget report"
 msgstr "打开预算报表"
 
-#: ../src/dsp_mainwindow.c:212
+#: ../src/dsp-mainwindow.c:219
 msgid "Balance..."
 msgstr "余额..."
 
-#: ../src/dsp_mainwindow.c:212
+#: ../src/dsp-mainwindow.c:219
 msgid "Open the Balance report"
 msgstr "打开余额报表"
 
-#: ../src/dsp_mainwindow.c:213
+#: ../src/dsp-mainwindow.c:220
 msgid "_Vehicle cost..."
 msgstr "汽车花费...(_V)"
 
-#: ../src/dsp_mainwindow.c:213
+#: ../src/dsp-mainwindow.c:220
 msgid "Open the Vehicle cost report"
 msgstr "打开汽车花费报表"
 
 #. Tools
-#: ../src/dsp_mainwindow.c:216
+#: ../src/dsp-mainwindow.c:223
 msgid "Show welcome dialog..."
 msgstr "显示欢迎窗口..."
 
-#: ../src/dsp_mainwindow.c:217
+#: ../src/dsp-mainwindow.c:224
 msgid "File statistics..."
 msgstr "信息统计"
 
-#: ../src/dsp_mainwindow.c:218
+#: ../src/dsp-mainwindow.c:225
 msgid "Anonymize..."
 msgstr "匿名..."
 
 #. HelpMenu
-#: ../src/dsp_mainwindow.c:221
+#: ../src/dsp-mainwindow.c:228
 msgid "_Contents"
 msgstr "帮助内容(_C)"
 
-#: ../src/dsp_mainwindow.c:221
+#: ../src/dsp-mainwindow.c:228
 msgid "Documentation about HomeBank"
 msgstr "关于家庭理财的文档"
 
-#: ../src/dsp_mainwindow.c:222
+#: ../src/dsp-mainwindow.c:229
 msgid "Get Help Online..."
 msgstr "获取在线帮助..."
 
-#: ../src/dsp_mainwindow.c:222
+#: ../src/dsp-mainwindow.c:229
 msgid "Connect to the LaunchPad website for online help"
 msgstr "连接到 LaunchPad 网站来获得在线帮助"
 
-#: ../src/dsp_mainwindow.c:223
-msgid "Translate this Application..."
-msgstr "翻译这个程序..."
+#: ../src/dsp-mainwindow.c:231
+msgid "Check for updates..."
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:223
-msgid "Connect to the LaunchPad website to help translate this application"
-msgstr "连接到 LaunchPad 网站来帮助翻译这个程序"
+#: ../src/dsp-mainwindow.c:231
+msgid "Visit HomeBank website to check for update"
+msgstr ""
+
+#: ../src/dsp-mainwindow.c:232
+msgid "Release Notes"
+msgstr ""
+
+#: ../src/dsp-mainwindow.c:232
+msgid "Display the release notes"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:224
+#: ../src/dsp-mainwindow.c:233
 msgid "Report a Problem..."
 msgstr "报告问题..."
 
-#: ../src/dsp_mainwindow.c:224
+#: ../src/dsp-mainwindow.c:233
 msgid "Connect to the LaunchPad website to help fix problems"
 msgstr "连接到 LaunchPad 网站来帮助修复问题"
 
-#: ../src/dsp_mainwindow.c:226
+#: ../src/dsp-mainwindow.c:234
+msgid "Translate this Application..."
+msgstr "翻译这个程序..."
+
+#: ../src/dsp-mainwindow.c:234
+msgid "Connect to the LaunchPad website to help translate this application"
+msgstr "连接到 LaunchPad 网站来帮助翻译这个程序"
+
+#: ../src/dsp-mainwindow.c:236
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/dsp_mainwindow.c:226
+#: ../src/dsp-mainwindow.c:236
 msgid "About HomeBank"
 msgstr "关于 HomeBank"
 
 #. name         , icon-name, label, accelerator, tooltip, callback, is_active
-#: ../src/dsp_mainwindow.c:234
+#: ../src/dsp-mainwindow.c:244
 msgid "_Toolbar"
 msgstr "工具栏(_T)"
 
-#: ../src/dsp_mainwindow.c:235
+#: ../src/dsp-mainwindow.c:245
 msgid "_Top spending"
 msgstr "最多消费(_T)"
 
-#: ../src/dsp_mainwindow.c:236
-msgid "_Scheduled list"
-msgstr "计划列表(_S)"
+#: ../src/dsp-mainwindow.c:246
+msgid "_Bottom Lists"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:237 ../src/ui-pref.c:92
+#: ../src/dsp-mainwindow.c:247 ../src/ui-pref.c:92
 msgid "Euro minor"
-msgstr ""
+msgstr "欧元设置"
 
-#: ../src/dsp_mainwindow.c:367
+#: ../src/dsp-mainwindow.c:384
 #, c-format
 msgid "Revert unsaved changes to file '%s'?"
-msgstr ""
+msgstr "恢复未保存的更改文件？‘%s’"
 
-#: ../src/dsp_mainwindow.c:370
+#: ../src/dsp-mainwindow.c:387
 msgid ""
 "- Changes made to the file will be permanently lost\n"
 "- File will be reloaded from the last save (.xhb~)"
@@ -756,94 +787,83 @@ msgstr ""
 "-对文件的修改将永久丢失\n"
 "-文件将重新加载上次存档（.xhb~）"
 
-#: ../src/dsp_mainwindow.c:377
+#: ../src/dsp-mainwindow.c:394
 msgid "_Revert"
 msgstr "恢复(_R)"
 
-#: ../src/dsp_mainwindow.c:565
+#: ../src/dsp-mainwindow.c:585
 msgid "Are you sure you want to anonymize the file?"
-msgstr ""
+msgstr "你确定要隐藏去这个文件吗？"
 
-#: ../src/dsp_mainwindow.c:568
+#: ../src/dsp-mainwindow.c:588
 msgid ""
 "Proceeding will anonymize any text, \n"
 "like 'account x', 'payee y', 'memo z', ..."
 msgstr ""
 
-#: ../src/dsp_mainwindow.c:575
+#: ../src/dsp-mainwindow.c:595
 msgid "_Anonymize"
-msgstr ""
+msgstr "匿名"
 
-#: ../src/dsp_mainwindow.c:863
+#: ../src/dsp-mainwindow.c:932
 msgid "Welcome to HomeBank"
 msgstr "欢迎使用HomeBank"
 
-#: ../src/dsp_mainwindow.c:890
+#: ../src/dsp-mainwindow.c:959
 msgid "What do you want to do:"
 msgstr "要做什么事："
 
-#: ../src/dsp_mainwindow.c:894
+#: ../src/dsp-mainwindow.c:963
 msgid "Read HomeBank _Manual"
 msgstr "阅读HomeBank手册(_M)"
 
-#: ../src/dsp_mainwindow.c:898
-msgid "Configure _Preferences"
-msgstr "配置首选项(_P)"
+#: ../src/dsp-mainwindow.c:967
+msgid "Configure _preferences"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:902
+#: ../src/dsp-mainwindow.c:971
 msgid "Create a _new file"
 msgstr "新建文件(_n)"
 
-#: ../src/dsp_mainwindow.c:906
+#: ../src/dsp-mainwindow.c:975
 msgid "_Open an existing file"
 msgstr "打开已存在的文件(_O)"
 
-#: ../src/dsp_mainwindow.c:910
+#: ../src/dsp-mainwindow.c:979
 msgid "Open the _example file"
 msgstr "打开示例理财档案(_e)"
 
-#: ../src/dsp_mainwindow.c:1298 ../src/rep_stats.c:1025 ../src/rep_stats.c:1045
-#: ../src/ui-budget.c:131 ../src/ui-category.c:392 ../src/ui-category.c:594
-msgid "(no category)"
-msgstr "(没有分类)"
-
-#: ../src/dsp_mainwindow.c:1319
-msgid "Other"
-msgstr "其它"
-
-#: ../src/dsp_mainwindow.c:1562
-msgid "No transaction to add"
-msgstr "没有记账被添加"
-
-#: ../src/dsp_mainwindow.c:1564
+#: ../src/dsp-mainwindow.c:1208
 #, c-format
-msgid "transaction added: %d"
-msgstr "添加记账：%d"
+msgid ""
+"Your are about to open the backup file '%s'.\n"
+"\n"
+"Are you sure you want to do this ?"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:1567
-msgid "Check scheduled transactions result"
-msgstr "检查计划记账结果"
+#: ../src/dsp-mainwindow.c:1212
+msgid "Open the backup file ?"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:1684 ../src/dsp_mainwindow.c:1954
-#: ../src/rep_vehicle.c:846
-msgid "Total"
-msgstr "合计"
+#: ../src/dsp-mainwindow.c:1214
+msgid "_Open backup"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:1764 ../src/ui-currency.c:1160
-msgid "Unknow error"
-msgstr "未知错误"
+#: ../src/dsp-mainwindow.c:1312 ../src/ui-currency.c:1312
+msgid "Unknown error"
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:1769 ../src/dsp_mainwindow.c:1844
+#: ../src/dsp-mainwindow.c:1317 ../src/dsp-mainwindow.c:1423
 #, c-format
 msgid "I/O error for file '%s'."
 msgstr "输入/输出错误位于文件 '%s'"
 
-#: ../src/dsp_mainwindow.c:1772
+#: ../src/dsp-mainwindow.c:1320
 #, c-format
 msgid "The file '%s' is not a valid HomeBank file."
 msgstr "文件'%s'不是有效HomeBank文件。"
 
-#: ../src/dsp_mainwindow.c:1775
+#: ../src/dsp-mainwindow.c:1323
 #, c-format
 msgid ""
 "The file '%s' was saved with a higher version of HomeBank\n"
@@ -852,676 +872,700 @@ msgstr ""
 "文件'%s'为高版本HomeBank所保存\n"
 "无法用当前版本打开"
 
-#: ../src/dsp_mainwindow.c:1780 ../src/dsp_mainwindow.c:1847
-#: ../src/dsp_mainwindow.c:2465
+#: ../src/dsp-mainwindow.c:1328 ../src/dsp-mainwindow.c:1426
 msgid "File error"
 msgstr "文件错误"
 
-#: ../src/dsp_mainwindow.c:1985
-msgid "Grand total"
-msgstr "合计"
+#: ../src/dsp-mainwindow.c:1399
+msgid "The file has been modified since reading it."
+msgstr ""
 
-#: ../src/dsp_mainwindow.c:2466
-#, c-format
-msgid "The file %s is not a valid HomeBank file."
+#: ../src/dsp-mainwindow.c:1400
+msgid ""
+"If you save it, all the external changes could be lost. Save it anyway?"
+msgstr ""
+
+#: ../src/dsp-mainwindow.c:1401
+msgid "S_ave Anyway"
 msgstr ""
-"文件 %s\n"
-"不是一个有效的家庭理财文件。"
 
-#: ../src/dsp_mainwindow.c:2549 ../src/dsp_mainwindow.c:2638
+#: ../src/dsp-mainwindow.c:1970 ../src/dsp-mainwindow.c:2061
 msgid "Open"
 msgstr "打开"
 
-#: ../src/dsp_mainwindow.c:2555 ../src/list_operation.c:1032
-#: ../src/list_operation.c:1350 ../src/list_upcoming.c:420
-#: ../src/rep_time.c:121 ../src/ui-account.c:1271 ../src/ui-assist-import.c:60
-#: ../src/ui-dialogs.c:207 ../src/ui-filter.c:1340
+#. 5.2 we always create the column and set it not visible
+#. gtk_assistant_set_page_title (GTK_ASSISTANT (data->assistant), page, _("Transaction"));
+#. gtk_assistant_set_page_title (GTK_ASSISTANT (data->assistant), page, genacc->name);
+#: ../src/dsp-mainwindow.c:1976 ../src/list-operation.c:1198
+#: ../src/list-scheduled.c:483 ../src/rep-stats.c:149 ../src/rep-time.c:125
+#: ../src/ui-account.c:1345 ../src/ui-assist-import.c:2028
+#: ../src/ui-dialogs.c:211
 msgid "Account"
 msgstr "账户"
 
-#: ../src/dsp_mainwindow.c:2558 ../src/list_operation.c:47
-#: ../src/list_operation.c:1067 ../src/list_operation.c:1379
-#: ../src/list_upcoming.c:362 ../src/rep_stats.c:143 ../src/rep_time.c:121
-#: ../src/ui-assign.c:40 ../src/ui-dialogs.c:225 ../src/ui-filter.c:1332
-#: ../src/ui-pref.c:131
+#. payee
+#: ../src/dsp-mainwindow.c:1979 ../src/hb-export.c:445
+#: ../src/list-operation.c:1232 ../src/list-scheduled.c:419
+#: ../src/rep-stats.c:148 ../src/rep-time.c:127 ../src/ui-archive.c:291
+#: ../src/ui-assist-import.c:386 ../src/ui-dialogs.c:229 ../src/ui-payee.c:957
+#: ../src/ui-pref.c:132 ../src/ui-widgets-data.c:36
 msgid "Payee"
 msgstr "交易人"
 
+#. category
+#: ../src/dsp-mainwindow.c:1982 ../src/list-operation.c:1293
+#: ../src/rep-budget.c:1486 ../src/rep-budget.c:1667 ../src/rep-stats.c:146
+#: ../src/rep-time.c:126 ../src/ui-assist-import.c:390 ../src/ui-budget.c:232
+#: ../src/ui-dialogs.c:238 ../src/ui-payee.c:993 ../src/ui-split.c:202
+#: ../src/ui-split.c:791 ../src/ui-widgets-data.c:49
+msgid "Category"
+msgstr "类别"
+
 #. TRANSLATORS: an archive is stored transaction buffers (kind of bookmark to prefill manual insertion)
-#: ../src/dsp_mainwindow.c:2565
+#: ../src/dsp-mainwindow.c:1986
 msgid "Archive"
 msgstr "模板"
 
 #. column: Income
-#: ../src/dsp_mainwindow.c:2568 ../src/dsp_mainwindow.c:2580
-#: ../src/rep_budget.c:74 ../src/rep_budget.c:400 ../src/rep_budget.c:881
-#: ../src/rep_budget.c:1518
+#: ../src/dsp-mainwindow.c:1989 ../src/dsp-mainwindow.c:2001
+#: ../src/rep-budget.c:932 ../src/rep-budget.c:1486 ../src/rep-budget.c:1682
 msgid "Budget"
 msgstr "预算"
 
-#: ../src/dsp_mainwindow.c:2571
+#: ../src/dsp-mainwindow.c:1992
 msgid "Show"
 msgstr "显示"
 
-#: ../src/dsp_mainwindow.c:2577
+#: ../src/dsp-mainwindow.c:1998
 msgid "Statistics"
 msgstr "统计"
 
 #. column: Balance
-#: ../src/dsp_mainwindow.c:2583 ../src/list_operation.c:54
-#: ../src/list_operation.c:1145 ../src/rep_balance.c:1241
-#: ../src/rep_stats.c:154 ../src/rep_stats.c:705 ../src/rep_stats.c:1926
+#: ../src/dsp-mainwindow.c:2004 ../src/hb-export.c:449
+#: ../src/list-operation.c:1311 ../src/rep-balance.c:1314
+#: ../src/rep-stats.c:161 ../src/rep-stats.c:1824 ../src/rep-stats.c:2007
 msgid "Balance"
 msgstr "余额"
 
-#: ../src/dsp_mainwindow.c:2586 ../src/ui-hbfile.c:275
+#: ../src/dsp-mainwindow.c:2007 ../src/ui-hbfile.c:275
 msgid "Vehicle cost"
 msgstr "汽车花费"
 
-#: ../src/dsp_mainwindow.c:2631 ../src/ui-dialogs.c:476 ../src/ui-dialogs.c:538
-#: ../src/ui-dialogs.c:601
+#: ../src/dsp-mainwindow.c:2048 ../src/ui-assist-import.c:734
+#: ../src/ui-dialogs.c:499 ../src/ui-dialogs.c:567 ../src/ui-dialogs.c:653
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../src/dsp_mainwindow.c:2635
+#: ../src/dsp-mainwindow.c:2053
 msgid "Open a recently used file"
 msgstr "打开最近用过的文件"
 
-#: ../src/dsp_mainwindow.c:2653
-msgid "Your accounts"
-msgstr "你的帐户"
-
-#: ../src/dsp_mainwindow.c:2685
-msgid "Where your money goes"
-msgstr "资金流动情况"
+#: ../src/dsp-mainwindow.c:2148 ../src/ui-widgets-data.c:28
+msgid "Scheduled"
+msgstr "计划"
 
-#: ../src/dsp_mainwindow.c:2704
-msgid "Top spending"
-msgstr "最高消费"
+#. Future
+#: ../src/dsp-mainwindow.c:2152 ../src/list-account.c:432
+msgid "Future"
+msgstr "将来"
 
-#: ../src/dsp_mainwindow.c:2757
-msgid "Scheduled transactions"
-msgstr "交易日程修改"
+#: ../src/dsp-mainwindow.c:2155 ../src/ui-transaction.c:59
+msgid "Remind"
+msgstr "提示"
 
-#: ../src/dsp_mainwindow.c:2764
-msgid "maximum post date"
-msgstr ""
+#: ../src/hb-archive.c:281
+msgid "(new archive)"
+msgstr "(新模板)"
 
-#: ../src/dsp_mainwindow.c:2800
-msgid "Skip"
-msgstr ""
+#: ../src/hb-category.c:468 ../src/rep-stats.c:1002 ../src/rep-stats.c:1022
+#: ../src/ui-budget.c:117 ../src/ui-category.c:352 ../src/ui-category.c:570
+msgid "(no category)"
+msgstr "(没有分类)"
 
-#: ../src/dsp_mainwindow.c:2804
-msgid "Edit & Post"
-msgstr ""
+#: ../src/hb-category.c:944 ../src/hb-payee.c:562
+msgid "invalid CSV format"
+msgstr "无效的CSV文件"
 
-#. TRANSLATORS: Posting a scheduled transaction is the action to materialize it into its target account.
-#. TRANSLATORS: Before that action the automated transaction occurrence is pending and not yet really existing.
-#: ../src/dsp_mainwindow.c:2810
-msgid "Post"
-msgstr ""
+#: ../src/hb-export.c:443 ../src/list-operation.c:1209
+#: ../src/rep-balance.c:1295 ../src/rep-vehicle.c:218 ../src/rep-vehicle.c:1104
+#: ../src/ui-assist-import.c:358
+msgid "Date"
+msgstr "日期"
 
-#: ../src/hb-archive.c:163
-msgid "(new archive)"
-msgstr "(新模板)"
+#: ../src/hb-export.c:444 ../src/list-operation.c:1054
+#: ../src/ui-assist-import.c:372 ../src/ui-pref.c:133 ../src/ui-pref.c:2365
+msgid "Info"
+msgstr "信息"
 
-#: ../src/hb-category.c:979
-msgid "invalid CSV format"
-msgstr ""
+#. memo
+#: ../src/hb-export.c:446 ../src/list-operation.c:1240
+#: ../src/list-scheduled.c:440 ../src/ui-archive.c:275
+#: ../src/ui-assist-import.c:363 ../src/ui-pref.c:131 ../src/ui-split.c:220
+#: ../src/ui-split.c:795 ../src/ui-widgets-data.c:35
+msgid "Memo"
+msgstr "备注"
 
-#: ../src/hb-filter.c:74
-#, c-format
-msgid "<i>from</i> %s <i>to</i> %s"
-msgstr "<i>从</i>%s<i>到</i>%s"
+#. column: Amount
+#. amount
+#: ../src/hb-export.c:447 ../src/list-operation.c:1269 ../src/rep-time.c:1546
+#: ../src/rep-time.c:1668 ../src/rep-vehicle.c:222 ../src/rep-vehicle.c:1149
+#: ../src/ui-assist-import.c:367 ../src/ui-split.c:236 ../src/ui-split.c:799
+msgid "Amount"
+msgstr "总额"
 
-#: ../src/hb-hbfile.c:498
+#: ../src/hb-hbfile.c:596 ../src/ui-assist-import.c:2028
 msgid "Unknown"
 msgstr "未知"
 
 #. TRANSLATORS: format a liter number with l/L as abbreviation
-#: ../src/hb-preferences.c:251
+#: ../src/hb-preferences.c:253
 #, c-format
 msgid "%.2f l"
 msgstr ""
 
 #. TRANSLATORS: kilometer per liter
-#: ../src/hb-preferences.c:254
+#: ../src/hb-preferences.c:256
 msgid "km/l"
-msgstr ""
+msgstr "千克/升"
 
 #. TRANSLATORS: miles per liter
-#: ../src/hb-preferences.c:257
+#: ../src/hb-preferences.c:259
 msgid "mi./l"
+msgstr "米/升"
+
+#. g_snprintf(buffer, 63, "%d-%02d", g_date_get_year(date), g_date_get_month(date));
+#. TRANSLATORS: printf string for year of week W, ex. 2019-W52 for week 52 of 2019
+#: ../src/hb-report.c:333
+#, c-format
+msgid "%d-w%d"
 msgstr ""
 
-#: ../src/homebank.c:69
+#. g_snprintf(buffer, 63, "%d-%02d", g_date_get_year(date), g_date_get_month(date));
+#. todo: will be innacurrate here if fiscal year start not 1/jan
+#. TRANSLATORS: printf string for year of quarter Q, ex. 2019-Q4 for quarter 4 of 2019
+#: ../src/hb-report.c:347
+#, c-format
+msgid "%d-q%d"
+msgstr ""
+
+#: ../src/homebank.c:70
 msgid "Output version information and exit"
-msgstr "输出版本信息并退出"
+msgstr "输出账户信息并退出"
 
-#: ../src/homebank.c:72
+#: ../src/homebank.c:73
 msgid "[FILE]"
 msgstr "[文件]"
 
-#: ../src/homebank.c:294
+#: ../src/homebank.c:249
 msgid "Browser error."
 msgstr "浏览器错误"
 
-#: ../src/homebank.c:295
+#: ../src/homebank.c:250
 #, c-format
 msgid "Could not display the URL '%s'"
-msgstr "不能显示网址 “%s”"
+msgstr "无法显示 URL '%s'"
 
-#: ../src/homebank.c:900 ../src/homebank.c:901
+#: ../src/homebank.c:859 ../src/homebank.c:860
 msgid "HomeBank options"
 msgstr "家庭理财选项"
 
-#: ../src/homebank.c:1030
+#: ../src/homebank.c:989
 #, c-format
 msgid "Unable to open '%s', the file does not exist.\n"
 msgstr "无法打开“%s”，文件不存在。\n"
 
-#: ../src/hb-import-csv.c:249 ../src/hb-import.c:65
-#, c-format
-msgid "(account %d)"
-msgstr "(帐户 %d)"
+#: ../src/hub-account.c:115
+msgid "(no institution)"
+msgstr ""
 
-#: ../src/list_account.c:343 ../src/ui-assist-import.c:2079
-msgid "Accounts"
-msgstr "账户"
+#: ../src/hub-account.c:255 ../src/hub-scheduled.c:383 ../src/rep-vehicle.c:853
+msgid "Total"
+msgstr "合计"
 
-#. Bank
-#: ../src/list_account.c:354 ../src/ui-account.c:40
-msgid "Bank"
-msgstr "银行"
+#: ../src/hub-account.c:296
+msgid "Grand total"
+msgstr "合计"
 
-#. Today
-#: ../src/list_account.c:358
-msgid "Today"
-msgstr "今天"
+#: ../src/hub-account.c:427
+msgid "Your accounts"
+msgstr "你的帐户"
 
-#. Future
-#: ../src/list_account.c:362
-msgid "Future"
-msgstr "将来"
+#: ../src/hub-account.c:442 ../src/ui-budget.c:1098 ../src/ui-category.c:1938
+#: ../src/ui-filter.c:357
+msgid "Expand all"
+msgstr "全部展开"
 
-#. datas
-#. status
-#. date
-#: ../src/list_operation.c:46 ../src/list_operation.c:881 ../src/ui-pref.c:2180
-msgid "Info"
-msgstr "信息"
+#: ../src/hub-account.c:446 ../src/ui-budget.c:1102 ../src/ui-category.c:1942
+#: ../src/ui-filter.c:361
+msgid "Collapse all"
+msgstr "全部折叠"
 
-#: ../src/list_operation.c:48 ../src/list_operation.c:1075
-#: ../src/list_operation.c:1370 ../src/list_upcoming.c:380
-#: ../src/ui-archive.c:226 ../src/ui-assign.c:39 ../src/ui-pref.c:130
-#: ../src/ui-split.c:410
-msgid "Memo"
-msgstr "备注"
+#: ../src/hub-account.c:463
+msgid "Show all"
+msgstr "显示所有"
 
-#. column: Amount
-#: ../src/list_operation.c:49 ../src/list_operation.c:1103
-#: ../src/list_operation.c:1373 ../src/rep_time.c:608 ../src/rep_time.c:1746
-#: ../src/rep_vehicle.c:222 ../src/rep_vehicle.c:1142 ../src/ui-filter.c:1317
-#: ../src/ui-split.c:414
-msgid "Amount"
-msgstr "金额"
+#: ../src/hub-account.c:468
+msgid "By type"
+msgstr "按类型"
+
+#: ../src/hub-account.c:469
+msgid "By institution"
+msgstr ""
+
+#: ../src/hub-scheduled.c:261
+msgid "No transaction to add"
+msgstr "没有记账被添加"
+
+#: ../src/hub-scheduled.c:263
+#, c-format
+msgid "transaction added: %d"
+msgstr "添加记账：%d"
+
+#: ../src/hub-scheduled.c:266
+msgid "Check scheduled transactions result"
+msgstr "检查计划记账结果"
+
+#: ../src/hub-scheduled.c:428
+msgid "Scheduled transactions"
+msgstr "交易日程修改"
+
+#: ../src/hub-scheduled.c:444
+msgid "Skip"
+msgstr "跳过"
+
+#: ../src/hub-scheduled.c:448
+msgid "Edit & Post"
+msgstr "编辑后"
+
+#. TRANSLATORS: Posting a scheduled transaction is the action to materialize it into its target account.
+#. TRANSLATORS: Before that action the automated transaction occurrence is pending and not yet really existing.
+#: ../src/hub-scheduled.c:454
+msgid "Post"
+msgstr "提交"
+
+#: ../src/hub-scheduled.c:469
+msgid "maximum post date"
+msgstr "最后提交日期"
+
+#. hb_label_set_amount(GTK_LABEL(data->TX_topamount), total, GLOBALS->kcur, GLOBALS->minor);
+#: ../src/hub-spending.c:91
+msgid "Top spending"
+msgstr "总消费"
+
+#. future usage
+#: ../src/hub-spending.c:102
+#, c-format
+msgid "Top %d spending"
+msgstr ""
+
+#: ../src/hub-spending.c:294
+msgid "Other"
+msgstr "其它"
+
+#: ../src/hub-spending.c:357
+msgid "Where your money goes"
+msgstr "资金流动情况"
+
+#: ../src/hb-import.c:1321
+msgid "imported account"
+msgstr ""
+
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/list-account.c:412 ../src/ui-filter.c:560 ../src/ui-filter.c:1485
+msgid "Accounts"
+msgstr "账户"
+
+#. Bank
+#: ../src/list-account.c:424 ../src/ui-widgets-data.c:72
+msgid "Bank"
+msgstr "银行"
+
+#. Today
+#: ../src/list-account.c:428
+msgid "Today"
+msgstr "今日"
+
+#: ../src/list-operation.c:525
+msgid "- split -"
+msgstr "-拆分-"
+
+#: ../src/list-operation.c:1250
+msgid "Status"
+msgstr "状态"
 
 #. column: Expense
-#: ../src/list_operation.c:50 ../src/list_operation.c:1111
-#: ../src/list_upcoming.c:392 ../src/rep_balance.c:1233 ../src/rep_budget.c:72
-#: ../src/rep_stats.c:152 ../src/rep_stats.c:1914 ../src/ui-category.c:38
-#: ../src/ui-filter.c:49
+#: ../src/list-operation.c:1277 ../src/list-scheduled.c:454
+#: ../src/rep-balance.c:1306 ../src/rep-stats.c:159 ../src/rep-stats.c:1824
+#: ../src/rep-stats.c:1995 ../src/ui-widgets-data.c:42
+#: ../src/ui-widgets-data.c:129 ../src/ui-widgets-data.c:136
 msgid "Expense"
 msgstr "支出"
 
 #. column: Income
-#: ../src/list_operation.c:51 ../src/list_operation.c:1119
-#: ../src/list_upcoming.c:403 ../src/rep_balance.c:1237 ../src/rep_budget.c:72
-#: ../src/rep_stats.c:153 ../src/rep_stats.c:705 ../src/rep_stats.c:1920
-#: ../src/ui-category.c:39 ../src/ui-filter.c:50
+#: ../src/list-operation.c:1285 ../src/list-scheduled.c:465
+#: ../src/rep-balance.c:1310 ../src/rep-stats.c:160 ../src/rep-stats.c:1824
+#: ../src/rep-stats.c:2001 ../src/ui-widgets-data.c:43
+#: ../src/ui-widgets-data.c:130 ../src/ui-widgets-data.c:137
 msgid "Income"
 msgstr "收入"
 
-#: ../src/list_operation.c:53 ../src/list_operation.c:1135
+#: ../src/list-operation.c:1301
 msgid "Tags"
 msgstr "标签"
 
-#: ../src/list_operation.c:55 ../src/list_operation.c:1085
-#: ../src/ui-filter.c:1307
-msgid "Status"
-msgstr "状态"
-
-#: ../src/list_operation.c:478
-msgid "- split -"
-msgstr "-拆分-"
-
-#. common (date + status + amount)
-#. label = gtk_label_new(_("General"));
-#. page = ui_flt_manage_page_general(&data);
-#. gtk_notebook_append_page (GTK_NOTEBOOK (notebook), page, label);
-#. 
-#: ../src/list_operation.c:1044 ../src/list_operation.c:1361
-#: ../src/rep_balance.c:1222 ../src/rep_vehicle.c:218 ../src/rep_vehicle.c:1097
-#: ../src/ui-filter.c:1302 ../src/ui-pref.c:1480
-msgid "Date"
-msgstr "日期"
-
 #. TRANSLATORS: title of list column to inform the scheduled transaction is Late
-#: ../src/list_upcoming.c:316
+#: ../src/list-scheduled.c:372
 msgid "Late"
+msgstr "最近"
+
+#. TRANSLATORS: title of list column to inform how many occurence remain to post for limited scheduled txn
+#: ../src/list-scheduled.c:390
+msgid "Still"
 msgstr ""
 
-#: ../src/list_upcoming.c:348
+#: ../src/list-scheduled.c:404
 msgid "Next date"
-msgstr ""
+msgstr "下一个日期"
 
-#: ../src/rep_balance.c:76 ../src/rep_budget.c:80 ../src/rep_stats.c:65
-#: ../src/rep_time.c:66
+#: ../src/rep-balance.c:76 ../src/rep-budget.c:76 ../src/rep-stats.c:64
+#: ../src/rep-time.c:66
 msgid "List"
 msgstr "列表"
 
-#: ../src/rep_balance.c:76 ../src/rep_budget.c:80 ../src/rep_stats.c:65
-#: ../src/rep_time.c:66
+#: ../src/rep-balance.c:76 ../src/rep-budget.c:76 ../src/rep-stats.c:64
+#: ../src/rep-time.c:66
 msgid "View results as list"
 msgstr "以列表方式查看事项"
 
-#: ../src/rep_balance.c:77 ../src/rep_time.c:67
+#: ../src/rep-balance.c:77 ../src/rep-time.c:67
 msgid "Line"
 msgstr "曲线图"
 
-#: ../src/rep_balance.c:77 ../src/rep_time.c:67
+#: ../src/rep-balance.c:77 ../src/rep-time.c:67
 msgid "View results as lines"
 msgstr "以曲线图查看事项"
 
-#. { "Column"  , ICONNAME_HB_VIEW_COLUMN, N_("Column") , NULL,    N_("View results as column"), G_CALLBACK (ui_reptime_action_viewcolumn) },
 #. { "Filter"  , ICONNAME_HB_FILTER    , N_("Filter") , NULL,   N_("Edit the filter"), G_CALLBACK (ui_reptime_action_filter) },
-#: ../src/rep_balance.c:78 ../src/rep_budget.c:82 ../src/rep_stats.c:70
-#: ../src/rep_time.c:71 ../src/rep_vehicle.c:65
+#: ../src/rep-balance.c:83 ../src/rep-budget.c:83 ../src/rep-stats.c:73
+#: ../src/rep-time.c:74 ../src/rep-vehicle.c:65
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/rep_balance.c:78 ../src/rep_budget.c:82 ../src/rep_stats.c:70
-#: ../src/rep_time.c:71 ../src/rep_vehicle.c:65
+#: ../src/rep-balance.c:83 ../src/rep-budget.c:83 ../src/rep-stats.c:73
+#: ../src/rep-time.c:74 ../src/rep-vehicle.c:65
 msgid "Refresh results"
 msgstr "刷新事项"
 
 #. name, icon-name
-#: ../src/rep_balance.c:85 ../src/rep_budget.c:91 ../src/rep_stats.c:79
-#: ../src/rep_time.c:79
+#: ../src/rep-balance.c:90 ../src/rep-budget.c:92 ../src/rep-stats.c:82
+#: ../src/rep-time.c:82
 msgid "Detail"
 msgstr "明细"
 
 #. label, accelerator
-#: ../src/rep_balance.c:86 ../src/rep_budget.c:92 ../src/rep_stats.c:80
-#: ../src/rep_time.c:80
+#: ../src/rep-balance.c:91 ../src/rep-budget.c:93 ../src/rep-stats.c:83
+#: ../src/rep-time.c:83
 msgid "Toggle detail"
 msgstr "切换明细"
 
 #. //TRANSLATORS: count of transaction in balancedrawn / count of total transaction under abalancedrawn amount threshold
-#: ../src/rep_balance.c:309
+#: ../src/rep-balance.c:331
 #, c-format
 msgid "%d/%d under %s"
 msgstr "%d/%d 在 %s 以下"
 
-#: ../src/rep_balance.c:808
+#: ../src/rep-balance.c:876
 msgid "Balance report"
 msgstr "余额报告"
 
-#: ../src/rep_balance.c:831 ../src/rep_budget.c:1093 ../src/rep_stats.c:1501
-#: ../src/rep_time.c:1368 ../src/rep_vehicle.c:723
+#: ../src/rep-balance.c:899 ../src/rep-budget.c:1154 ../src/rep-stats.c:1489
+#: ../src/rep-time.c:1185 ../src/rep-vehicle.c:730
 msgid "Display"
-msgstr ""
+msgstr "显示"
 
-#: ../src/rep_balance.c:835 ../src/rep_time.c:1379 ../src/ui-archive.c:942
-#: ../src/ui-assist-import.c:974 ../src/ui-transaction.c:979
+#: ../src/rep-balance.c:903 ../src/rep-time.c:1197 ../src/ui-archive.c:1009
+#: ../src/ui-transaction.c:1222 ../src/ui-txn-multi.c:450
 msgid "A_ccount:"
 msgstr "账户(_C)："
 
-#: ../src/rep_balance.c:842 ../src/rep_time.c:1403
+#: ../src/rep-balance.c:910 ../src/rep-time.c:1229
 msgid "Select _all"
 msgstr "全选(_A)"
 
-#: ../src/rep_balance.c:847
+#: ../src/rep-balance.c:915
 msgid "Each _day"
 msgstr "每天(_D)"
 
-#: ../src/rep_balance.c:858 ../src/rep_stats.c:1530 ../src/rep_time.c:1425
+#: ../src/rep-balance.c:926 ../src/rep-stats.c:1521 ../src/rep-time.c:1258
 msgid "_Zoom X:"
 msgstr "拉伸 X 轴(_Z)："
 
-#: ../src/rep_balance.c:870 ../src/rep_budget.c:1121 ../src/rep_stats.c:1549
-#: ../src/rep_time.c:1438 ../src/rep_vehicle.c:744
+#: ../src/rep-balance.c:938 ../src/rep-budget.c:1187 ../src/rep-stats.c:1539
+#: ../src/rep-time.c:1270 ../src/rep-vehicle.c:751
 msgid "Date filter"
-msgstr ""
+msgstr "筛选日期"
 
-#: ../src/rep_balance.c:880 ../src/rep_budget.c:1131 ../src/rep_stats.c:1559
-#: ../src/rep_time.c:1448 ../src/rep_vehicle.c:754 ../src/ui-filter.c:960
-#: ../src/ui-filter.c:1073
+#: ../src/rep-balance.c:948 ../src/rep-budget.c:1197 ../src/rep-stats.c:1549
+#: ../src/rep-time.c:1280 ../src/rep-vehicle.c:761 ../src/ui-filter.c:1165
+#: ../src/ui-filter.c:1268
 msgid "_From:"
 msgstr "从(_F)："
 
-#: ../src/rep_balance.c:886 ../src/rep_budget.c:1137 ../src/rep_stats.c:1565
-#: ../src/rep_time.c:1454 ../src/rep_vehicle.c:760 ../src/ui-filter.c:968
-#: ../src/ui-filter.c:1080
+#: ../src/rep-balance.c:954 ../src/rep-budget.c:1203 ../src/rep-stats.c:1555
+#: ../src/rep-time.c:1286 ../src/rep-vehicle.c:767 ../src/ui-filter.c:1171
+#: ../src/ui-filter.c:1275
 msgid "_To:"
 msgstr "到(_T)："
 
-#: ../src/rep_budget.c:72 ../src/rep_stats.c:151
-msgid "Exp. & Inc."
-msgstr "支出和收入"
-
-#: ../src/rep_budget.c:74
-msgid "Spent & Budget"
-msgstr "花费和预算"
-
-#. column: Expense
-#: ../src/rep_budget.c:74 ../src/rep_budget.c:400 ../src/rep_budget.c:1514
-msgid "Spent"
-msgstr "花费"
-
-#. column: Result
-#. header
-#: ../src/rep_budget.c:74 ../src/rep_budget.c:400 ../src/rep_budget.c:881
-#: ../src/rep_budget.c:1522 ../src/rep_stats.c:705 ../src/rep_stats.c:1903
-msgid "Result"
-msgstr "事项"
-
-#: ../src/rep_budget.c:81
+#: ../src/rep-budget.c:77
 msgid "Stack"
 msgstr ""
 
-#: ../src/rep_budget.c:81
+#: ../src/rep-budget.c:77
 msgid "View results as stack bars"
 msgstr ""
 
-#: ../src/rep_budget.c:84 ../src/rep_stats.c:72 ../src/rep_time.c:73
-#: ../src/rep_vehicle.c:67
-msgid "Export"
-msgstr "导出"
-
-#: ../src/rep_budget.c:828
+#: ../src/rep-budget.c:874
 msgid " over"
-msgstr ""
+msgstr " 超支"
 
-#: ../src/rep_budget.c:833
+#: ../src/rep-budget.c:880
 msgid " left"
-msgstr ""
+msgstr " 结余"
 
-#: ../src/rep_budget.c:835
+#: ../src/rep-budget.c:883
 msgid " under"
-msgstr ""
+msgstr " 严重超支"
 
 #. update stack chart
-#: ../src/rep_budget.c:875
+#: ../src/rep-budget.c:926
 #, c-format
 msgid "Budget for %s"
 msgstr ""
 
-#: ../src/rep_budget.c:1068
+#. column: Result
+#: ../src/rep-budget.c:932 ../src/rep-budget.c:1486 ../src/rep-budget.c:1686
+#: ../src/rep-stats.c:1824 ../src/rep-stats.c:1984
+msgid "Result"
+msgstr "事项"
+
+#: ../src/rep-budget.c:1129
 msgid "Budget report"
 msgstr "预算报表"
 
-#: ../src/rep_budget.c:1097 ../src/rep_time.c:1372
-msgid "_For:"
-msgstr "按照(_F)："
+#: ../src/rep-budget.c:1158 ../src/rep-stats.c:1493 ../src/rep-time.c:1189
+msgid "_View by:"
+msgstr "查看方式(_V)："
+
+#: ../src/rep-budget.c:1173
+msgid "Only out of budget"
+msgstr ""
 
-#: ../src/rep_budget.c:1105
-msgid "_Kind:"
-msgstr "种类(_K)："
+#. gtk_widget_set_halign (menu, GTK_ALIGN_END);
+#: ../src/rep-budget.c:1267 ../src/rep-stats.c:1628 ../src/rep-time.c:1353
+msgid "_Result to clipboard"
+msgstr ""
 
-#: ../src/rep_budget.c:1206
-msgid "Result:"
+#: ../src/rep-budget.c:1271 ../src/rep-stats.c:1632 ../src/rep-time.c:1357
+msgid "_Result to CSV"
+msgstr ""
+
+#: ../src/rep-budget.c:1275 ../src/rep-stats.c:1636 ../src/rep-time.c:1361
+msgid "_Detail to clipboard"
+msgstr ""
+
+#: ../src/rep-budget.c:1280 ../src/rep-stats.c:1641 ../src/rep-time.c:1366
+msgid "_Detail to CSV"
 msgstr ""
 
-#: ../src/rep_budget.c:1212
+#: ../src/rep-budget.c:1314
+msgid "Result:"
+msgstr "结果:"
+
+#: ../src/rep-budget.c:1320
 msgid "Budget:"
 msgstr "预算："
 
-#: ../src/rep_budget.c:1218
+#: ../src/rep-budget.c:1326
 msgid "Spent:"
 msgstr "花费："
 
-#: ../src/rep_budget.c:1336
+#: ../src/rep-budget.c:1447
 msgid "No account is defined to be part of the budget."
 msgstr "未定义账户"
 
-#: ../src/rep_budget.c:1337
+#: ../src/rep-budget.c:1448
 msgid "You should include some accounts from the account dialog."
 msgstr "请在账户对话框中选择账户"
 
-#: ../src/rep_stats.c:66 ../src/ui-pref.c:2386
+#. column: Expense
+#: ../src/rep-budget.c:1486 ../src/rep-budget.c:1678
+msgid "Spent"
+msgstr "花费"
+
+#: ../src/rep-stats.c:65 ../src/rep-time.c:68
 msgid "Column"
 msgstr "列"
 
-#: ../src/rep_stats.c:66
+#: ../src/rep-stats.c:65 ../src/rep-time.c:68
 msgid "View results as column"
-msgstr ""
+msgstr "将结果以柱状图的方式展现"
 
-#: ../src/rep_stats.c:67
+#: ../src/rep-stats.c:66
 msgid "Donut"
-msgstr ""
+msgstr "饼图"
 
-#: ../src/rep_stats.c:67
+#: ../src/rep-stats.c:66
 msgid "View results as donut"
-msgstr ""
+msgstr "将结果以饼图的方式展现"
 
-#: ../src/rep_stats.c:69
-msgid "Edit the filter"
-msgstr "编辑过滤"
+#: ../src/rep-stats.c:72 ../src/ui-filter.c:1402
+msgid "Edit filter"
+msgstr "编辑过滤器"
 
 #. is_active
 #. name, icon-name
-#: ../src/rep_stats.c:85
+#: ../src/rep-stats.c:88
 msgid "Legend"
-msgstr "图例"
+msgstr "图表"
 
 #. label, accelerator
-#: ../src/rep_stats.c:86
+#: ../src/rep-stats.c:89
 msgid "Toggle legend"
-msgstr "切换图例"
+msgstr "切换图表"
 
 #. is_active
 #. name, icon-name
-#: ../src/rep_stats.c:91
+#: ../src/rep-stats.c:94
 msgid "Rate"
 msgstr "百分比"
 
 #. label, accelerator
-#: ../src/rep_stats.c:92
+#: ../src/rep-stats.c:95
 msgid "Toggle rate"
 msgstr "切换百分比"
 
-#: ../src/rep_stats.c:144
+#: ../src/rep-stats.c:147 ../src/ui-widgets-data.c:50
+msgid "Subcategory"
+msgstr "子类别"
+
+#: ../src/rep-stats.c:150 ../src/rep-time.c:128
 msgid "Tag"
 msgstr "标签"
 
-#: ../src/rep_stats.c:145 ../src/rep_time.c:125 ../src/ui-archive.c:53
+#: ../src/rep-stats.c:151 ../src/rep-time.c:136 ../src/ui-widgets-data.c:113
 msgid "Month"
 msgstr "月"
 
-#: ../src/rep_stats.c:146 ../src/rep_time.c:125 ../src/ui-archive.c:53
+#: ../src/rep-stats.c:152 ../src/rep-time.c:139 ../src/ui-widgets-data.c:114
 msgid "Year"
 msgstr "å¹´"
 
-#: ../src/rep_stats.c:163 ../src/ui-filter.c:91
-msgid "January"
-msgstr "1月"
-
-#: ../src/rep_stats.c:164 ../src/ui-filter.c:92
-msgid "February"
-msgstr "2月"
-
-#: ../src/rep_stats.c:165 ../src/ui-filter.c:93
-msgid "March"
-msgstr "3月"
-
-#: ../src/rep_stats.c:166 ../src/ui-filter.c:94
-msgid "April"
-msgstr "4月"
-
-#: ../src/rep_stats.c:167 ../src/rep_time.c:136 ../src/ui-filter.c:95
-msgid "May"
-msgstr "5月"
-
-#: ../src/rep_stats.c:168 ../src/ui-filter.c:96
-msgid "June"
-msgstr "6月"
-
-#: ../src/rep_stats.c:169 ../src/ui-filter.c:97
-msgid "July"
-msgstr "7月"
-
-#: ../src/rep_stats.c:170 ../src/ui-filter.c:98
-msgid "August"
-msgstr "8月"
-
-#: ../src/rep_stats.c:171 ../src/ui-filter.c:99
-msgid "September"
-msgstr "9月"
-
-#: ../src/rep_stats.c:172 ../src/ui-filter.c:100
-msgid "October"
-msgstr "10月"
-
-#: ../src/rep_stats.c:173 ../src/ui-filter.c:101
-msgid "November"
-msgstr "11月"
-
-#: ../src/rep_stats.c:174 ../src/ui-filter.c:102
-msgid "December"
-msgstr "12月"
+#: ../src/rep-stats.c:158 ../src/ui-widgets-data.c:128
+msgid "Exp. & Inc."
+msgstr "支出和收入"
 
-#. set chart title
-#. //TRANSLATORS: example 'Expense by Category'
-#: ../src/rep_stats.c:607
+#. TRANSLATORS: example 'Expense by Category'
+#: ../src/rep-stats.c:417
 #, c-format
 msgid "%s by %s"
 msgstr ""
 
-#: ../src/rep_stats.c:705
-msgid "expense"
-msgstr "支出"
-
-#: ../src/rep_stats.c:1057 ../src/ui-payee.c:279 ../src/ui-payee.c:484
+#: ../src/rep-stats.c:1034 ../src/ui-payee.c:547 ../src/ui-payee.c:745
 msgid "(no payee)"
 msgstr "(无收款人)"
 
-#: ../src/rep_stats.c:1478
+#: ../src/rep-stats.c:1468
 msgid "Statistics Report"
 msgstr "统计报表"
 
-#: ../src/rep_stats.c:1505
-msgid "_View:"
-msgstr "查看(_V)："
-
-#: ../src/rep_stats.c:1512
-msgid "_By:"
-msgstr ""
-
-#: ../src/rep_stats.c:1519
+#: ../src/rep-stats.c:1510
 msgid "By _amount"
 msgstr "按金额(_A)"
 
-#: ../src/rep_stats.c:1642
+#: ../src/rep-stats.c:1675
 msgid "Balance:"
 msgstr "余额："
 
-#: ../src/rep_stats.c:1648
+#: ../src/rep-stats.c:1681
 msgid "Income:"
 msgstr "收入："
 
-#: ../src/rep_stats.c:1655
+#: ../src/rep-stats.c:1688
 msgid "Expense:"
 msgstr "支出："
 
-#: ../src/rep_time.c:125 ../src/ui-archive.c:53
+#: ../src/rep-time.c:134 ../src/ui-widgets-data.c:111
 msgid "Day"
 msgstr "天"
 
-#: ../src/rep_time.c:125 ../src/ui-archive.c:53
+#: ../src/rep-time.c:135 ../src/ui-widgets-data.c:112
 msgid "Week"
 msgstr "周"
 
-#: ../src/rep_time.c:125
+#: ../src/rep-time.c:137
 msgid "Quarter"
 msgstr "季度"
 
-#: ../src/rep_time.c:132
-msgid "Jan"
-msgstr "1月"
-
-#: ../src/rep_time.c:133
-msgid "Feb"
-msgstr "2月"
-
-#: ../src/rep_time.c:134
-msgid "Mar"
-msgstr "3月"
-
-#: ../src/rep_time.c:135
-msgid "Apr"
-msgstr "4月"
-
-#: ../src/rep_time.c:137
-msgid "Jun"
-msgstr "6月"
-
-#: ../src/rep_time.c:138
-msgid "Jul"
-msgstr "7月"
-
-#: ../src/rep_time.c:139
-msgid "Aug"
-msgstr "8月"
-
-#: ../src/rep_time.c:140
-msgid "Sep"
-msgstr "9月"
-
-#: ../src/rep_time.c:141
-msgid "Oct"
-msgstr "10月"
-
-#: ../src/rep_time.c:142
-msgid "Nov"
-msgstr "11月"
-
-#: ../src/rep_time.c:143
-msgid "Dec"
-msgstr "12月"
+#: ../src/rep-time.c:138
+msgid "Half Year"
+msgstr ""
 
-#. //TRANSLATORS: example 'Expense by Category'
-#: ../src/rep_time.c:568
+#. visible = (tmpmode == REPORT_RESULT_TOTAL) ? TRUE : FALSE;
+#. gtk_chart_show_average(GTK_CHART(data->RE_line), data->average, visible);
+#. TRANSLATORS: example 'Category Over Time'
+#: ../src/rep-time.c:372
 #, c-format
 msgid "%s Over Time"
 msgstr ""
 
-#. header
-#: ../src/rep_time.c:608 ../src/rep_time.c:1735
-msgid "Time slice"
-msgstr "时间段"
-
-#. //TRANSLATORS: count of transaction in balancedrawn / count of total transaction under abalancedrawn amount threshold
-#: ../src/rep_time.c:1031
+#: ../src/rep-time.c:837
 #, c-format
 msgid "Average: %s"
-msgstr ""
+msgstr "平均：%s"
 
-#: ../src/rep_time.c:1345
+#: ../src/rep-time.c:1162
 msgid "Trend Time Report"
 msgstr "走势报表"
 
-#: ../src/rep_time.c:1408
+#: ../src/rep-time.c:1205 ../src/ui-archive.c:1058 ../src/ui-assign.c:872
+#: ../src/ui-hbfile.c:279 ../src/ui-payee.c:1222 ../src/ui-transaction.c:1295
+#: ../src/ui-txn-multi.c:512
+msgid "_Category:"
+msgstr "类别(_C)："
+
+#: ../src/rep-time.c:1213 ../src/ui-archive.c:1050 ../src/ui-assign.c:843
+#: ../src/ui-transaction.c:1276 ../src/ui-txn-multi.c:496
+msgid "_Payee:"
+msgstr "交易人(_P)："
+
+#: ../src/rep-time.c:1221 ../src/ui-filter.c:1230
+msgid "_Tag:"
+msgstr "标签(_T)："
+
+#: ../src/rep-time.c:1234
 msgid "_Cumulate"
 msgstr "累计(_C)"
 
-#: ../src/rep_time.c:1413
-msgid "_View by:"
-msgstr "查看方式(_V)："
+#: ../src/rep-time.c:1239
+msgid "Inter_val:"
+msgstr ""
+
+#: ../src/rep-time.c:1247
+msgid "Show empty line"
+msgstr ""
+
+#: ../src/rep-time.c:1546 ../src/rep-time.c:1656
+msgid "Time slice"
+msgstr "时间段"
+
+#: ../src/rep-vehicle.c:67
+msgid "Export"
+msgstr "导出"
 
 #. 
 #. LST_CAR_DATE,
-#. LST_CAR_WORDING,
+#. LST_CAR_MEMO,
 #. LST_CAR_METER,
 #. LST_CAR_FUEL,
 #. LST_CAR_PRICE,
@@ -1530,105 +1574,108 @@ msgstr "查看方式(_V)："
 #. LST_CAR_100KM
 #. 
 #. 
-#. column: Wording
+#. column: Memo
 #. 
 #. column = gtk_tree_view_column_new();
-#. gtk_tree_view_column_set_title(column, _("Wording"));
+#. gtk_tree_view_column_set_title(column, _("Memo"));
 #. gtk_tree_view_append_column (GTK_TREE_VIEW(view), column);
 #. renderer = gtk_cell_renderer_text_new();
 #. gtk_tree_view_column_pack_start(column, renderer, TRUE);
-#. gtk_tree_view_column_add_attribute(column, renderer, "text", LST_CAR_WORDING);
+#. gtk_tree_view_column_add_attribute(column, renderer, "text", LST_CAR_MEMO);
 #. //gtk_tree_view_column_set_cell_data_func(column, renderer, repvehicle_text_cell_data_function, NULL, NULL);
 #. 
 #. column: Meter
-#: ../src/rep_vehicle.c:219 ../src/rep_vehicle.c:1130
+#: ../src/rep-vehicle.c:219 ../src/rep-vehicle.c:1137
 msgid "Meter"
 msgstr "里程表"
 
 #. column: Fuel load
-#: ../src/rep_vehicle.c:220 ../src/rep_vehicle.c:1134
+#: ../src/rep-vehicle.c:220 ../src/rep-vehicle.c:1141
 msgid "Fuel"
 msgstr "燃料"
 
 #. column: Price by unit
-#: ../src/rep_vehicle.c:221 ../src/rep_vehicle.c:1138
+#: ../src/rep-vehicle.c:221 ../src/rep-vehicle.c:1145
 msgid "Price"
 msgstr "ä»·æ ¼"
 
 #. column: Distance done
-#: ../src/rep_vehicle.c:223 ../src/rep_vehicle.c:1146
+#: ../src/rep-vehicle.c:223 ../src/rep-vehicle.c:1153
 msgid "Dist."
 msgstr "里程"
 
-#: ../src/rep_vehicle.c:699
+#: ../src/rep-vehicle.c:706
 msgid "Vehicle cost report"
 msgstr "交通费用报告"
 
-#: ../src/rep_vehicle.c:727
+#: ../src/rep-vehicle.c:734
 msgid "Vehi_cle:"
 msgstr "交通(_C)"
 
-#: ../src/rep_vehicle.c:813
+#: ../src/rep-vehicle.c:820
 msgid "Meter:"
 msgstr "里程表："
 
-#: ../src/rep_vehicle.c:817
+#: ../src/rep-vehicle.c:824
 msgid "Consumption:"
 msgstr "油耗："
 
-#: ../src/rep_vehicle.c:821
+#: ../src/rep-vehicle.c:828
 msgid "Fuel cost:"
 msgstr "燃料费用："
 
-#: ../src/rep_vehicle.c:825
+#: ../src/rep-vehicle.c:832
 msgid "Other cost:"
 msgstr "其它费用："
 
-#: ../src/rep_vehicle.c:829
+#: ../src/rep-vehicle.c:836
 msgid "Total cost:"
 msgstr "费用合计："
 
-#: ../src/ui-account.c:39
-msgid "(no type)"
-msgstr "(缺少类型)"
-
-#: ../src/ui-account.c:41 ../src/ui-widgets.c:800
-msgid "Cash"
-msgstr "现金"
-
-#: ../src/ui-account.c:42
-msgid "Asset"
-msgstr "资产"
-
-#: ../src/ui-account.c:43 ../src/ui-widgets.c:798
-msgid "Credit card"
-msgstr "信用卡"
-
-#: ../src/ui-account.c:44
-msgid "Liability"
-msgstr "负债"
-
-#: ../src/ui-account.c:358 ../src/ui-assign.c:100 ../src/ui-currency.c:246
-#: ../src/ui-widgets.c:797
+#. populate_view_acc(data->LV_acc, GLOBALS->acc_list, TRUE);
+#. populate template
+#: ../src/ui-account.c:338 ../src/ui-account.c:1231 ../src/ui-assign.c:98
+#: ../src/ui-currency.c:245 ../src/ui-tag.c:206 ../src/ui-widgets.c:1067
 msgid "(none)"
 msgstr "(无)"
 
-#: ../src/ui-account.c:514 ../src/ui-assign.c:249 ../src/ui-category.c:1015
-#: ../src/ui-currency.c:603 ../src/ui-payee.c:654 ../src/ui-pref.c:2375
+#: ../src/ui-account.c:497 ../src/ui-assign.c:249 ../src/ui-category.c:995
+#: ../src/ui-currency.c:599 ../src/ui-payee.c:937 ../src/ui-tag.c:349
 msgid "Visible"
 msgstr "可见"
 
-#: ../src/ui-account.c:945 ../src/ui-account.c:1052
+#. GTK_FILE_CHOOSER_ACTION_OPEN,
+#: ../src/ui-account.c:647 ../src/ui-assist-import.c:732
+#: ../src/ui-category.c:1290 ../src/ui-category.c:1437 ../src/ui-currency.c:777
+#: ../src/ui-currency.c:1145 ../src/ui-dialogs.c:69 ../src/ui-dialogs.c:334
+#: ../src/ui-dialogs.c:451 ../src/ui-dialogs.c:512 ../src/ui-dialogs.c:578
+#: ../src/ui-dialogs.c:652 ../src/ui-dialogs.c:722 ../src/ui-dialogs.c:772
+#: ../src/ui-dialogs.c:918 ../src/ui-filter.c:1407 ../src/ui-hbfile.c:194
+#: ../src/ui-payee.c:1180 ../src/ui-payee.c:1343 ../src/ui-pref.c:2138
+#: ../src/ui-split.c:726 ../src/ui-tag.c:492 ../src/ui-transaction.c:1134
+#: ../src/ui-txn-multi.c:384
+msgid "_Cancel"
+msgstr "取消"
+
+#. gtk_dialog_add_button(GTK_DIALOG(dialog), _("_Remove"), GTK_RESPONSE_SPLIT_REM);
+#: ../src/ui-account.c:649 ../src/ui-category.c:1292 ../src/ui-currency.c:779
+#: ../src/ui-currency.c:1147 ../src/ui-dialogs.c:335 ../src/ui-dialogs.c:919
+#: ../src/ui-filter.c:1409 ../src/ui-hbfile.c:196 ../src/ui-payee.c:1182
+#: ../src/ui-pref.c:2140 ../src/ui-split.c:740 ../src/ui-tag.c:494
+#: ../src/ui-transaction.c:1135 ../src/ui-txn-multi.c:386
+msgid "_OK"
+msgstr "确定(_O)"
+
+#: ../src/ui-account.c:963 ../src/ui-account.c:1076
 msgid "Account name"
 msgstr "账户名"
 
-#: ../src/ui-account.c:951 ../src/ui-account.c:1058
-#: ../src/ui-assist-import.c:1034 ../src/ui-category.c:1375
-#: ../src/ui-payee.c:965
+#: ../src/ui-account.c:969 ../src/ui-account.c:1082 ../src/ui-category.c:1361
+#: ../src/ui-payee.c:1276 ../src/ui-tag.c:552
 msgid "Error"
 msgstr "错误"
 
-#: ../src/ui-account.c:952
+#: ../src/ui-account.c:970
 #, c-format
 msgid ""
 "Cannot add an account '%s',\n"
@@ -1637,36 +1684,28 @@ msgstr ""
 "不能添加账户'%s',\n"
 "名字已经存在。"
 
-#: ../src/ui-account.c:994
+#: ../src/ui-account.c:1018
 #, c-format
 msgid "Cannot delete account '%s'"
-msgstr ""
+msgstr "不能删除账户‘%s’"
 
-#: ../src/ui-account.c:998
+#: ../src/ui-account.c:1022
 msgid ""
 "This account contains transactions and/or is part of internal transfers."
-msgstr ""
+msgstr "此帐户包含事项或内部转帐的一部分。"
 
-#: ../src/ui-account.c:1009 ../src/ui-archive.c:316 ../src/ui-assign.c:545
-#: ../src/ui-category.c:1560 ../src/ui-currency.c:1299 ../src/ui-payee.c:1135
+#: ../src/ui-account.c:1033 ../src/ui-archive.c:392 ../src/ui-assign.c:548
+#: ../src/ui-category.c:1549 ../src/ui-currency.c:1539 ../src/ui-payee.c:1450
+#: ../src/ui-tag.c:596
 #, c-format
 msgid "Are you sure you want to permanently delete '%s'?"
-msgstr ""
+msgstr "您确定要永久删除吗？‘%s’"
 
-#: ../src/ui-account.c:1011
+#: ../src/ui-account.c:1035
 msgid "If you delete an account, it will be permanently lost."
-msgstr ""
+msgstr "如果您删除一个帐户，它将永久丢失。"
 
-#: ../src/ui-account.c:1017 ../src/ui-account.c:1245 ../src/ui-archive.c:324
-#: ../src/ui-archive.c:1152 ../src/ui-assign.c:553 ../src/ui-assign.c:769
-#: ../src/ui-category.c:1124 ../src/ui-category.c:1572
-#: ../src/ui-category.c:1991 ../src/ui-currency.c:1307
-#: ../src/ui-currency.c:1539 ../src/ui-payee.c:745 ../src/ui-payee.c:1147
-#: ../src/ui-payee.c:1319
-msgid "_Delete"
-msgstr ""
-
-#: ../src/ui-account.c:1059 ../src/ui-assist-import.c:1035
+#: ../src/ui-account.c:1083
 #, c-format
 msgid ""
 "Cannot rename this Account,\n"
@@ -1677,531 +1716,504 @@ msgstr ""
 "从 '%s'到'%s'，\n"
 "文件名已存在。"
 
-#: ../src/ui-account.c:1184
+#: ../src/ui-account.c:1258
 msgid "Manage Accounts"
 msgstr "管理账户"
 
-#: ../src/ui-account.c:1235
+#: ../src/ui-account.c:1309
 msgid ""
 "Drag & drop to change the order\n"
 "Double-click to rename"
 msgstr ""
 
-#: ../src/ui-account.c:1241 ../src/ui-archive.c:1148 ../src/ui-assign.c:765
-#: ../src/ui-currency.c:1531 ../src/ui-transaction.c:1106
+#: ../src/ui-account.c:1315 ../src/ui-archive.c:1254 ../src/ui-assign.c:768
+#: ../src/ui-category.c:1977 ../src/ui-currency.c:1726 ../src/ui-payee.c:1667
+#: ../src/ui-tag.c:755 ../src/ui-transaction.c:1145
 msgid "_Add"
-msgstr ""
+msgstr "添加"
 
-#: ../src/ui-account.c:1262 ../src/ui-hbfile.c:222 ../src/ui-pref.c:86
-#: ../src/ui-pref.c:1350 ../src/ui-pref.c:1661
+#: ../src/ui-account.c:1336 ../src/ui-hbfile.c:222 ../src/ui-pref.c:84
+#: ../src/ui-pref.c:1376 ../src/ui-pref.c:1748
 msgid "General"
 msgstr "常规"
 
-#: ../src/ui-account.c:1282
+#: ../src/ui-account.c:1357
 msgid "_Currency:"
-msgstr ""
+msgstr "币种："
 
-#: ../src/ui-account.c:1289
+#: ../src/ui-account.c:1364
 msgid "Start _balance:"
 msgstr ""
 
-#: ../src/ui-account.c:1297
+#: ../src/ui-account.c:1372
 msgid "Notes:"
-msgstr ""
+msgstr "备注："
 
-#: ../src/ui-account.c:1311
+#: ../src/ui-account.c:1388
 msgid "this account was _closed"
 msgstr "此账户已关闭"
 
-#: ../src/ui-account.c:1322
+#: ../src/ui-account.c:1399
 msgid "Current check number"
 msgstr ""
 
-#: ../src/ui-account.c:1326
+#: ../src/ui-account.c:1403
 msgid "Checkbook _1:"
 msgstr "支票簿_1"
 
-#: ../src/ui-account.c:1333
+#: ../src/ui-account.c:1410
 msgid "Checkbook _2:"
 msgstr "支票簿_2:"
 
-#: ../src/ui-account.c:1345 ../src/ui-budget.c:1189
+#: ../src/ui-account.c:1422 ../src/ui-budget.c:1199
 msgid "Options"
-msgstr ""
+msgstr "设置"
 
-#: ../src/ui-account.c:1354
+#: ../src/ui-account.c:1431
 msgid "Institution"
-msgstr ""
+msgstr "机构"
 
-#: ../src/ui-account.c:1358 ../src/ui-assist-start.c:364
-#: ../src/ui-assist-import.c:962 ../src/ui-payee.c:896
+#: ../src/ui-account.c:1435 ../src/ui-assist-start.c:386
+#: ../src/ui-currency.c:1228 ../src/ui-payee.c:1205 ../src/ui-tag.c:517
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: ../src/ui-account.c:1366 ../src/ui-assist-start.c:384
+#: ../src/ui-account.c:1443 ../src/ui-assist-start.c:407
 msgid "N_umber:"
 msgstr "账户号码(_U)："
 
-#: ../src/ui-account.c:1379
+#: ../src/ui-account.c:1456
 msgid "Balance limits"
 msgstr ""
 
-#: ../src/ui-account.c:1385
+#: ../src/ui-account.c:1462
 msgid "_Overdraft at:"
 msgstr ""
 
-#: ../src/ui-account.c:1397
+#: ../src/ui-account.c:1474
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../src/ui-account.c:1478
+msgid "Default _Template:"
+msgstr ""
+
+#: ../src/ui-account.c:1492
 msgid "Report exclusion"
 msgstr ""
 
-#: ../src/ui-account.c:1401
+#: ../src/ui-account.c:1496
 msgid "exclude from account _summary"
 msgstr "从账户汇总中排除(_s)"
 
-#: ../src/ui-account.c:1406
+#: ../src/ui-account.c:1501
 msgid "exclude from the _budget"
 msgstr "从预算中删除(_b)"
 
-#: ../src/ui-account.c:1411
+#: ../src/ui-account.c:1506
 msgid "exclude from any _reports"
 msgstr "从报告中排除(_r)"
 
-#: ../src/ui-archive.c:47
-msgid "Scheduled"
-msgstr ""
-
-#: ../src/ui-archive.c:48
-msgid "Template"
-msgstr ""
-
-#: ../src/ui-archive.c:55
-msgid "Possible"
-msgstr ""
-
-#: ../src/ui-archive.c:55
-msgid "Before"
-msgstr ""
-
-#: ../src/ui-archive.c:55
-msgid "After"
-msgstr ""
-
-#: ../src/ui-archive.c:271
+#: ../src/ui-archive.c:346
 #, c-format
 msgid "(template %d)"
-msgstr ""
+msgstr "模板 %d"
 
-#: ../src/ui-archive.c:318
+#: ../src/ui-archive.c:394
 msgid "If you delete a scheduled/template, it will be permanently lost."
-msgstr ""
+msgstr "如果删除计划/模板，它将永久丢失。"
 
-#: ../src/ui-archive.c:908 ../src/ui-transaction.c:939
+#: ../src/ui-archive.c:993 ../src/ui-transaction.c:1204
+#: ../src/ui-txn-multi.c:436
 msgid "_Amount:"
 msgstr "金额(_A)："
 
-#: ../src/ui-archive.c:916 ../src/ui-transaction.c:947
+#: ../src/ui-archive.c:1001 ../src/ui-transaction.c:1213
 msgid "Toggle amount sign"
 msgstr "标记总数标记"
 
-#: ../src/ui-archive.c:924 ../src/ui-split.c:362 ../src/ui-transaction.c:955
+#: ../src/ui-archive.c:1004 ../src/ui-split.c:723 ../src/ui-transaction.c:1216
 msgid "Transaction splits"
 msgstr ""
 
-#: ../src/ui-archive.c:927 ../src/ui-assign.c:897
+#: ../src/ui-archive.c:1017
+msgid "_To account:"
+msgstr "转入账户(_T)"
+
+#: ../src/ui-archive.c:1027 ../src/ui-assign.c:900
 msgid "Pay_ment:"
 msgstr "付款方式(_M)："
 
-#: ../src/ui-archive.c:935 ../src/ui-transaction.c:966
+#: ../src/ui-archive.c:1041 ../src/ui-transaction.c:1250
 msgid "Of notebook _2"
 msgstr "用支票本 _2"
 
-#: ../src/ui-archive.c:950
-msgid "_To account:"
-msgstr "转入账户(_T)"
-
-#: ../src/ui-archive.c:983 ../src/ui-filter.c:1020
+#: ../src/ui-archive.c:1077 ../src/ui-filter.c:1215
 msgid "_Memo:"
 msgstr "备忘(_M)："
 
-#: ../src/ui-archive.c:1007
+#: ../src/ui-archive.c:1085 ../src/ui-transaction.c:1319
+#: ../src/ui-txn-multi.c:544
+msgid "Ta_gs:"
+msgstr "标签(_g):"
+
+#: ../src/ui-archive.c:1114
 msgid "Scheduled insertion"
 msgstr ""
 
-#: ../src/ui-archive.c:1012
+#: ../src/ui-archive.c:1119
 msgid "_Activate"
 msgstr "激活(_A)"
 
-#: ../src/ui-archive.c:1017
+#: ../src/ui-archive.c:1124
 msgid "Next _date:"
-msgstr ""
+msgstr "下一个日期"
 
-#: ../src/ui-archive.c:1025
+#: ../src/ui-archive.c:1132
 msgid "Ever_y:"
 msgstr "每(_Y)："
 
-#: ../src/ui-archive.c:1041
+#: ../src/ui-archive.c:1148
 msgid "Week end:"
-msgstr ""
+msgstr "周末"
 
-#: ../src/ui-archive.c:1053
+#: ../src/ui-archive.c:1160
 msgid "_Stop after:"
 msgstr ""
 
-#: ../src/ui-archive.c:1061
+#: ../src/ui-archive.c:1168
 msgid "posts"
 msgstr ""
 
-#: ../src/ui-archive.c:1083
+#: ../src/ui-archive.c:1190
 msgid "Manage scheduled/template transactions"
 msgstr "管理计划/模板记账"
 
-#: ../src/ui-assign.c:268 ../src/ui-filter.c:1322
+#: ../src/ui-assign.c:268
 msgid "Text"
 msgstr "文本"
 
-#: ../src/ui-assign.c:517
+#: ../src/ui-assign.c:520
 #, c-format
 msgid "(assignment %d)"
 msgstr "(归类 %d)"
 
-#: ../src/ui-assign.c:547
+#: ../src/ui-assign.c:550
 msgid "If you delete an assignment, it will be permanently lost."
 msgstr ""
 
-#: ../src/ui-assign.c:693
+#: ../src/ui-assign.c:696
 msgid "Disabled"
-msgstr ""
+msgstr "禁用"
 
-#: ../src/ui-assign.c:694
+#: ../src/ui-assign.c:697
 msgid "If empty"
 msgstr ""
 
-#: ../src/ui-assign.c:695
+#: ../src/ui-assign.c:698
 msgid "Overwrite"
-msgstr ""
+msgstr "覆盖"
 
-#: ../src/ui-assign.c:714
+#: ../src/ui-assign.c:717
 msgid "Manage Assignments"
 msgstr "管理归类"
 
-#: ../src/ui-assign.c:791
+#: ../src/ui-assign.c:794
 msgid "Condition"
-msgstr ""
+msgstr "条件"
 
-#: ../src/ui-assign.c:795
+#: ../src/ui-assign.c:798
 msgid "Search _in:"
 msgstr ""
 
 #. label = make_label_widget(_("Con_tains:"));
-#: ../src/ui-assign.c:803
+#: ../src/ui-assign.c:806
 msgid "Fi_nd:"
 msgstr ""
 
-#: ../src/ui-assign.c:811
+#: ../src/ui-assign.c:814
 msgid "Match _case"
 msgstr ""
 
-#: ../src/ui-assign.c:816
+#: ../src/ui-assign.c:819
 msgid "Use _regular expressions"
 msgstr ""
 
-#: ../src/ui-assign.c:831
+#: ../src/ui-assign.c:834
 msgid "Assign payee"
 msgstr ""
 
-#: ../src/ui-assign.c:860
+#: ../src/ui-assign.c:863
 msgid "Assign category"
 msgstr ""
 
-#: ../src/ui-assign.c:888
+#: ../src/ui-assign.c:891
 msgid "Assign payment"
 msgstr ""
 
-#: ../src/ui-assist-start.c:129
+#: ../src/ui-assist-start.c:141
 #, c-format
 msgid "New HomeBank file (%d of %d)"
 msgstr "新HomeBank文件(%d的%d)"
 
-#: ../src/ui-assist-start.c:160
+#: ../src/ui-assist-start.c:172
 msgid "Not found"
 msgstr "不存在"
 
-#: ../src/ui-assist-start.c:252 ../src/ui-hbfile.c:226
+#: ../src/ui-assist-start.c:274 ../src/ui-hbfile.c:226
 msgid "_Owner:"
 msgstr "所有者(_O)："
 
-#: ../src/ui-assist-start.c:260 ../src/ui-dialogs.c:363
+#: ../src/ui-assist-start.c:282 ../src/ui-dialogs.c:378
 msgid "Currency:"
-msgstr ""
+msgstr "币种:"
 
-#: ../src/ui-assist-start.c:276 ../src/ui-assist-import.c:1801
-#: ../src/ui-hbfile.c:191
+#: ../src/ui-assist-start.c:298 ../src/ui-hbfile.c:191
 msgid "File properties"
 msgstr "文件属性"
 
-#: ../src/ui-assist-start.c:298
+#: ../src/ui-assist-start.c:320
 msgid "System detection"
 msgstr ""
 
-#: ../src/ui-assist-start.c:302
+#: ../src/ui-assist-start.c:324
 msgid "Languages:"
 msgstr "语言："
 
-#: ../src/ui-assist-start.c:309
+#: ../src/ui-assist-start.c:331
 msgid "Preset file:"
 msgstr "预设"
 
-#: ../src/ui-assist-start.c:327
+#: ../src/ui-assist-start.c:349
 msgid "Initialize my categories with this file"
 msgstr "使用这个文件初始化我的类别"
 
-#: ../src/ui-assist-start.c:339
+#: ../src/ui-assist-start.c:361
 msgid "Preset categories"
 msgstr "预设类别"
 
-#: ../src/ui-assist-start.c:360
-msgid "Informations"
+#: ../src/ui-assist-start.c:382
+msgid "Information"
 msgstr ""
 
-#: ../src/ui-assist-start.c:395
+#: ../src/ui-assist-start.c:418
 msgid "Balances"
 msgstr ""
 
-#: ../src/ui-assist-start.c:399
+#: ../src/ui-assist-start.c:422
 msgid "_Initial:"
 msgstr "期初余额(_I)："
 
-#: ../src/ui-assist-start.c:406
+#: ../src/ui-assist-start.c:429
 msgid "_Overdrawn at:"
 msgstr "透支(_O)："
 
-#: ../src/ui-assist-start.c:415
+#: ../src/ui-assist-start.c:438
 msgid "Create an account"
 msgstr "创建帐号"
 
-#: ../src/ui-assist-start.c:425
+#: ../src/ui-assist-start.c:448
 msgid "This is a confirmation page, press 'Apply' to apply changes"
 msgstr "这时确认页面，点击 ‘Apply' 应用更新。"
 
-#: ../src/ui-assist-start.c:431 ../src/ui-assist-import.c:62
+#: ../src/ui-assist-start.c:454 ../src/ui-assist-import.c:2201
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../src/ui-assist-import.c:56
-msgid "Welcome"
+#: ../src/ui-assist-import.c:472
+msgid "<New account (global)>"
 msgstr ""
 
-#: ../src/ui-assist-import.c:57
-msgid "Select file"
+#: ../src/ui-assist-import.c:477
+msgid "<New account>"
 msgstr ""
 
-#: ../src/ui-assist-import.c:58
-msgid "Import"
+#: ../src/ui-assist-import.c:498
+msgid "<Skip this account>"
 msgstr ""
 
-#: ../src/ui-assist-import.c:59
-msgid "Properties"
+#: ../src/ui-assist-import.c:641
+msgid "Valid"
 msgstr ""
 
-#: ../src/ui-assist-import.c:61 ../src/ui-dialogs.c:216
-msgid "Transaction"
-msgstr ""
+#: ../src/ui-assist-import.c:652 ../src/ui-category.c:1012
+#: ../src/ui-currency.c:616 ../src/ui-currency.c:1209
+msgid "Name"
+msgstr "名称"
 
-#: ../src/ui-assist-import.c:132 ../src/ui-assist-import.c:958
-msgid "create new"
-msgstr ""
+#: ../src/ui-assist-import.c:746
+msgid "Known files"
+msgstr "已知文件"
 
-#: ../src/ui-assist-import.c:134 ../src/ui-assist-import.c:970
-msgid "use existing"
-msgstr ""
+#: ../src/ui-assist-import.c:757 ../src/ui-dialogs.c:463
+msgid "QIF files"
+msgstr "QIF 文件(.qif)"
 
-#: ../src/ui-assist-import.c:216
-msgid "Name in the file"
-msgstr ""
+#: ../src/ui-assist-import.c:765
+msgid "OFX/QFX files"
+msgstr "OFX/QFX 文件"
 
-#: ../src/ui-assist-import.c:224
-msgid "Action"
-msgstr "操作"
+#: ../src/ui-assist-import.c:773 ../src/ui-dialogs.c:527
+msgid "CSV files"
+msgstr "CSV 文件(.csv)"
 
-#: ../src/ui-assist-import.c:232
-msgid "Name in HomeBank"
-msgstr ""
+#: ../src/ui-assist-import.c:780 ../src/ui-dialogs.c:464
+#: ../src/ui-dialogs.c:528 ../src/ui-dialogs.c:590
+msgid "All files"
+msgstr "所有文件"
 
-#: ../src/ui-assist-import.c:597 ../src/ui-assist-import.c:843
-msgid "All seems all right here, your validation is optional!"
+#: ../src/ui-assist-import.c:839
+msgid "new global account"
 msgstr ""
 
-#: ../src/ui-assist-import.c:610
-#, c-format
-msgid ""
-"No account information has been found into the file '%s'.\n"
-"Please select the appropriate action for account below."
+#: ../src/ui-assist-import.c:842
+msgid "new account"
 msgstr ""
 
-#: ../src/ui-assist-import.c:849
-msgid ""
-"Possible duplicate of existing transaction have been found, and disabled for "
-"import.\n"
-"Please check and choose the ones that have to be imported."
+#: ../src/ui-assist-import.c:845
+msgid "skipped"
 msgstr ""
 
-#: ../src/ui-assist-import.c:936
-msgid "Change account action"
+#: ../src/ui-assist-import.c:864
+#, c-format
+msgid ", %d of %d transactions"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1083
-msgid "Please select a file..."
-msgstr "请选择一个文件..."
-
-#: ../src/ui-assist-import.c:1100
-msgid "QIF file recognised !"
-msgstr "QIF 文件被识别！"
-
-#: ../src/ui-assist-import.c:1106
-msgid "OFX file recognised !"
-msgstr "OFX 文件被识别！"
-
 #: ../src/ui-assist-import.c:1109
-msgid "** OFX support is disabled **"
-msgstr "** OFX 支持被禁用 **"
-
-#: ../src/ui-assist-import.c:1114
-msgid "CSV transaction file recognised !"
-msgstr "识别到CVS格式的记账文件"
-
-#: ../src/ui-assist-import.c:1120
-msgid "Unknown/Invalid file..."
-msgstr "未知/无效的文件..."
+msgid ""
+"Some date cannot be converted. Please try to change the date order to "
+"continue."
+msgstr ""
 
-#. file content detail
-#. TODO: difficult translation here
-#: ../src/ui-assist-import.c:1226
+#. label = g_strdup_printf(_("'%s' - %s"), genacc->name, hb_import_filetype_char_get(genacc));
+#: ../src/ui-assist-import.c:1273
 #, c-format
-msgid "account: %d - transaction: %d - payee: %d - categorie: %d"
-msgstr "账户：%d - 记账：%d - 交易人：%d - 类别：%d"
+msgid "Import <b>%s</b> in_to:"
+msgstr ""
 
-#: ../src/ui-assist-import.c:1347
-msgid "Some date convertion failed"
+#: ../src/ui-assist-import.c:1273
+msgid "this file"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1348
-#, c-format
-msgid "Reload using date order: '%s' ?"
+#: ../src/ui-assist-import.c:1273
+msgid "this account"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1563
+#: ../src/ui-assist-import.c:1280
 #, c-format
-msgid "Import assistant (%d of %d)"
+msgid ""
+"Name: %s\n"
+"Number: %s\n"
+"File: %s\n"
+"Encoding: %s"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1617
-msgid ""
-"Welcome to the HomeBank Import Assistant.\n"
-"\n"
-"With this assistant you will be guided throught the process\n"
-"of importing an external file into HomeBank.\n"
-"\n"
-"No changes will be made until you click \"Apply\" at the end\n"
-"of this assistant."
+#: ../src/ui-assist-import.c:1330
+msgid "Import transactions from bank or credit card"
 msgstr ""
-"欢迎使用HomeBank导入助手。\n"
-"\n"
-"此助手将引导你执行将外部文件\n"
-"导入到HomeBank的整个过程。\n"
-"\n"
-"在点击助手最后一页的“应用”按钮之前不会做任何修改。"
 
-#: ../src/ui-assist-import.c:1629
+#: ../src/ui-assist-import.c:1338
 msgid ""
-"HomeBank can import files in the following formats:\n"
-"- QIF\n"
-"- OFX/QFX (optional at compilation time)\n"
-"- CSV (format is specific to HomeBank, see the documentation)\n"
+"With this assistant you will be guided through the process of importing one "
+"or several\n"
+"downloaded statements from your bank or credit card, in the following "
+"formats:"
 msgstr ""
-"HomeBank可以导入下列的文件格式：\n"
-"- QIF\n"
-"- OFX/QFX (记账时间可以调整)\n"
-"- CSV (HomeBank特有格式，详情见文档)\n"
 
-#: ../src/ui-assist-import.c:1669
-msgid "Known files"
-msgstr "已知文件"
+#: ../src/ui-assist-import.c:1344
+msgid ""
+"<b>Recommended:</b> .OFX or .QFX\n"
+"<i>(Sometimes named Money™ or Quicken™)</i>\n"
+"<b>Supported:</b> .QIF\n"
+"<i>(Common Quicken™ file)</i>\n"
+"<b>Advanced users only:</b> .CSV\n"
+"<i>(format is specific to HomeBank, see the documentation)</i>"
+msgstr ""
 
-#: ../src/ui-assist-import.c:1680 ../src/ui-dialogs.c:440
-msgid "QIF files"
-msgstr "QIF 文件(.qif)"
+#: ../src/ui-assist-import.c:1364
+msgid ""
+"No changes will be made until you click \"Apply\" at the end of this "
+"assistant."
+msgstr ""
 
-#: ../src/ui-assist-import.c:1688
-msgid "OFX/QFX files"
-msgstr "OFX/QFX 文件"
+#: ../src/ui-assist-import.c:1368
+msgid "Don't show this again"
+msgstr ""
 
-#: ../src/ui-assist-import.c:1696 ../src/ui-dialogs.c:498
-msgid "CSV files"
-msgstr "CSV 文件(.csv)"
+#: ../src/ui-assist-import.c:1427
+msgid ""
+"Drag&Drop one or several files to import.\n"
+"You can also use the add/remove buttons of the list."
+msgstr ""
 
-#: ../src/ui-assist-import.c:1704 ../src/ui-dialogs.c:441
-#: ../src/ui-dialogs.c:499 ../src/ui-dialogs.c:554
-msgid "All files"
-msgstr "所有文件"
+#: ../src/ui-assist-import.c:1503
+msgid ""
+"There is too much account in the files you choosed,\n"
+"please use the back button to select less files."
+msgstr ""
 
-#: ../src/ui-assist-import.c:1768
-msgid "A general error occured, and this file cannot be loaded."
+#: ../src/ui-assist-import.c:1622
+msgid "Target account identification by name or number failed."
 msgstr ""
 
-#: ../src/ui-assist-import.c:1805
-msgid "Name:"
-msgstr "名称："
+#: ../src/ui-assist-import.c:1635 ../src/ui-pref.c:1148
+msgid "Date order:"
+msgstr "日期顺序:"
 
-#: ../src/ui-assist-import.c:1812
-msgid "Path:"
-msgstr "路径:"
+#: ../src/ui-assist-import.c:1651 ../src/ui-pref.c:1199
+msgid "_Import memos"
+msgstr ""
 
-#: ../src/ui-assist-import.c:1819
-msgid "Encoding:"
-msgstr "编码:"
+#: ../src/ui-assist-import.c:1655 ../src/ui-pref.c:1202
+msgid "_Swap memos with payees"
+msgstr ""
 
-#: ../src/ui-assist-import.c:1826
-msgid "Date format:"
+#: ../src/ui-assist-import.c:1665 ../src/ui-pref.c:1172
+msgid "OFX _Name:"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1838
-msgid "File content"
+#: ../src/ui-assist-import.c:1671 ../src/ui-pref.c:1181
+msgid "OFX _Memo:"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1842
-msgid "Content:"
-msgstr "内容："
+#: ../src/ui-assist-import.c:1687 ../src/ui-filter.c:308 ../src/ui-filter.c:453
+#: ../src/ui-filter.c:567
+msgid "Select:"
+msgstr "选择:"
 
-#: ../src/ui-assist-import.c:1908
-msgid "Choose the action for accounts"
-msgstr ""
+#: ../src/ui-assist-import.c:1690 ../src/ui-filter.c:311 ../src/ui-filter.c:456
+#: ../src/ui-filter.c:570
+msgid "All"
+msgstr "全部"
 
-#: ../src/ui-assist-import.c:1924
-msgid "Change _action"
-msgstr ""
+#: ../src/ui-assist-import.c:1694 ../src/ui-filter.c:316 ../src/ui-filter.c:461
+#: ../src/ui-filter.c:575 ../src/ui-pref.c:106 ../src/ui-transaction.c:56
+msgid "None"
+msgstr "无"
 
-#: ../src/ui-assist-import.c:1978
-msgid "Choose transactions to import"
+#: ../src/ui-assist-import.c:1698 ../src/ui-filter.c:321 ../src/ui-filter.c:466
+#: ../src/ui-filter.c:580
+msgid "Invert"
+msgstr "反向选择"
+
+#: ../src/ui-assist-import.c:1715 ../src/ui-pref.c:1157
+msgid "Sentence _case memo/payee"
 msgstr ""
 
-#: ../src/ui-assist-import.c:1992
-msgid "Detail of existing transaction (possible duplicate)"
+#: ../src/ui-assist-import.c:1749
+msgid "Similar transaction in target account (possible duplicate)"
 msgstr ""
 
-#: ../src/ui-assist-import.c:2014
-msgid "Date _tolerance:"
-msgstr "日期偏差(_T)："
+#: ../src/ui-assist-import.c:1773
+msgid "Date _gap:"
+msgstr ""
 
 #. TRANSLATORS: there is a spinner on the left of this label, and so you have 0....x days of date tolerance
-#: ../src/ui-assist-import.c:2022
+#: ../src/ui-assist-import.c:1781
 msgid "days"
 msgstr "天"
 
-#: ../src/ui-assist-import.c:2025
-msgid "_Refresh"
-msgstr ""
-
-#: ../src/ui-assist-import.c:2035
+#: ../src/ui-assist-import.c:1789
 msgid ""
 "The match is done in order: by account, amount and date.\n"
 "A date tolerance of 0 day means an exact match"
@@ -2209,124 +2221,100 @@ msgstr ""
 "已按以下要求排序列出符合条件的项目：按账户，金额和日期。\n"
 "日期的偏差为0天表示严格匹配"
 
-#: ../src/ui-assist-import.c:2068
+#: ../src/ui-assist-import.c:1852
 msgid "Click \"Apply\" to update your accounts.\n"
 msgstr "点击\"应用\"来更新账户\n"
 
-#: ../src/ui-assist-import.c:2091
-msgid "to update"
-msgstr "更新"
-
-#: ../src/ui-assist-import.c:2099
-msgid "to create"
-msgstr "创建"
+#: ../src/ui-assist-import.c:2178
+msgid "Welcome"
+msgstr "欢迎使用"
 
-#: ../src/ui-assist-import.c:2103 ../src/ui-pref.c:88
-msgid "Transactions"
-msgstr "è®°è´¦"
+#: ../src/ui-assist-import.c:2183
+msgid "Select file(s)"
+msgstr ""
 
-#: ../src/ui-assist-import.c:2112
-msgid "to import"
+#. gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), page, GTK_ASSISTANT_PAGE_PROGRESS);
+#: ../src/ui-assist-import.c:2188
+msgid "Import"
 msgstr "导入"
 
-#: ../src/ui-assist-import.c:2120
-msgid "to reject"
-msgstr "放弃"
-
-#: ../src/ui-assist-import.c:2128
-msgid "auto-assigned"
-msgstr "自动归类"
-
-#: ../src/ui-budget.c:508 ../src/ui-category.c:1164
+#: ../src/ui-budget.c:505 ../src/ui-category.c:1145 ../src/ui-payee.c:1078
 msgid "File format error"
 msgstr "文件格式错误"
 
-#: ../src/ui-budget.c:509 ../src/ui-category.c:1165
+#: ../src/ui-budget.c:506 ../src/ui-category.c:1146 ../src/ui-payee.c:1079
 msgid ""
 "The CSV file must contains the exact numbers of column,\n"
 "separated by a semi-colon, please see the help for more details."
 msgstr ""
 
-#: ../src/ui-budget.c:693
+#: ../src/ui-budget.c:690
 msgid "Are you sure you want to clear input?"
-msgstr ""
+msgstr "您确定要清除输入吗？"
 
-#: ../src/ui-budget.c:695
+#: ../src/ui-budget.c:692
 msgid "If you proceed, every amount will be set to 0."
 msgstr ""
 
-#: ../src/ui-budget.c:701
+#: ../src/ui-budget.c:698
 msgid "_Clear"
-msgstr ""
+msgstr "清除"
 
-#: ../src/ui-budget.c:993
+#: ../src/ui-budget.c:992
 msgid "Manage Budget"
 msgstr "预算管理"
 
-#: ../src/ui-budget.c:1036 ../src/ui-category.c:1862 ../src/ui-payee.c:1259
+#: ../src/ui-budget.c:1033 ../src/ui-category.c:1849 ../src/ui-payee.c:1598
 msgid "_Import CSV"
-msgstr ""
+msgstr "导入 CSV格式"
 
-#: ../src/ui-budget.c:1040 ../src/ui-category.c:1866 ../src/ui-payee.c:1263
+#: ../src/ui-budget.c:1037 ../src/ui-category.c:1853 ../src/ui-payee.c:1602
 msgid "E_xport CSV"
-msgstr ""
-
-#: ../src/ui-budget.c:1099 ../src/ui-category.c:1970
-msgid "Expand all"
-msgstr ""
-
-#: ../src/ui-budget.c:1103 ../src/ui-category.c:1974
-msgid "Collapse all"
-msgstr ""
+msgstr "导出 CSV格式"
 
-#: ../src/ui-budget.c:1125
+#: ../src/ui-budget.c:1124
 msgid "Budget for each month"
-msgstr ""
+msgstr "每月 预算"
 
-#: ../src/ui-budget.c:1130
+#: ../src/ui-budget.c:1131
 msgid "is the same"
 msgstr "相同"
 
-#: ../src/ui-budget.c:1142
+#: ../src/ui-budget.c:1145
 msgid "_Clear input"
 msgstr ""
 
-#: ../src/ui-budget.c:1156
+#: ../src/ui-budget.c:1160
 msgid "is different"
 msgstr "不同"
 
-#: ../src/ui-budget.c:1194
+#: ../src/ui-budget.c:1204
 msgid "_Force monitoring this category"
 msgstr "强制监视该类别(_F)"
 
-#: ../src/ui-category.c:1032 ../src/ui-currency.c:618 ../src/ui-currency.c:1107
-#: ../src/ui-payee.c:671
-msgid "Name"
-msgstr ""
-
-#: ../src/ui-category.c:1044 ../src/ui-payee.c:687
+#: ../src/ui-category.c:1024 ../src/ui-payee.c:973
 msgid "Usage"
-msgstr ""
+msgstr "使用"
 
-#: ../src/ui-category.c:1122
+#: ../src/ui-category.c:1103
 msgid "Delete unused categories"
 msgstr ""
 
-#: ../src/ui-category.c:1123
+#: ../src/ui-category.c:1104
 msgid ""
 "Are you sure you want to permanently\n"
 "delete unused categories?"
 msgstr ""
 
-#: ../src/ui-category.c:1301 ../src/ui-payee.c:868
+#: ../src/ui-category.c:1287 ../src/ui-payee.c:1177 ../src/ui-tag.c:489
 msgid "Edit..."
-msgstr ""
+msgstr "编辑..."
 
-#: ../src/ui-category.c:1325
+#: ../src/ui-category.c:1311
 msgid "_Income"
 msgstr "收入(_I)"
 
-#: ../src/ui-category.c:1376
+#: ../src/ui-category.c:1362
 #, c-format
 msgid ""
 "Cannot rename this Category,\n"
@@ -2337,400 +2325,354 @@ msgstr ""
 "从 '%s' 到 '%s'，\n"
 "这个名字已经存在了。"
 
-#: ../src/ui-category.c:1441
+#: ../src/ui-category.c:1426
 #, c-format
 msgid "Merge category '%s'"
 msgstr ""
 
-#: ../src/ui-category.c:1453 ../src/ui-payee.c:1033
+#: ../src/ui-category.c:1438 ../src/ui-payee.c:1344
 msgid "Merge"
-msgstr ""
+msgstr "合并"
 
-#: ../src/ui-category.c:1462
+#: ../src/ui-category.c:1447
 msgid ""
 "Transactions assigned to this category,\n"
 "will be moved to the category selected below."
 msgstr ""
 
-#: ../src/ui-category.c:1472
+#: ../src/ui-category.c:1457
 #, c-format
 msgid "_Delete the category '%s'"
 msgstr ""
 
-#: ../src/ui-category.c:1564
+#: ../src/ui-category.c:1553
 msgid ""
 "This category is used.\n"
 "Any transaction using that category will be set to (no category)"
 msgstr ""
 
-#: ../src/ui-category.c:1813
+#: ../src/ui-category.c:1802
 msgid "Manage Categories"
 msgstr "管理类别"
 
-#: ../src/ui-category.c:1873 ../src/ui-payee.c:1270
+#: ../src/ui-category.c:1860 ../src/ui-payee.c:1609
 msgid "_Delete unused"
 msgstr ""
 
-#: ../src/ui-category.c:1893
+#: ../src/ui-category.c:1955
 msgid "new category"
 msgstr ""
 
-#: ../src/ui-category.c:1906
+#: ../src/ui-category.c:1967
 msgid "new subcategory"
 msgstr ""
 
-#: ../src/ui-category.c:1988 ../src/ui-payee.c:1316
+#: ../src/ui-category.c:1984 ../src/ui-payee.c:1674
 msgid "_Merge"
-msgstr ""
+msgstr "合并"
 
-#: ../src/ui-currency.c:370 ../src/ui-currency.c:377
+#: ../src/ui-currency.c:366 ../src/ui-currency.c:373
 msgid "Base currency"
 msgstr ""
 
-#: ../src/ui-currency.c:629
+#: ../src/ui-currency.c:627
 msgid "Symbol"
-msgstr ""
+msgstr "货币符号"
 
-#: ../src/ui-currency.c:641 ../src/ui-currency.c:817 ../src/ui-pref.c:1392
+#: ../src/ui-currency.c:639 ../src/ui-currency.c:819 ../src/ui-pref.c:1418
 msgid "Exchange rate"
-msgstr ""
+msgstr "汇率"
 
-#: ../src/ui-currency.c:653
-msgid "Last modfied"
+#: ../src/ui-currency.c:652
+msgid "Last modified"
 msgstr ""
 
-#: ../src/ui-currency.c:772
+#: ../src/ui-currency.c:774
 msgid "Edit currency"
-msgstr ""
+msgstr "编辑货币"
 
-#: ../src/ui-currency.c:803 ../src/ui-pref.c:1365
+#: ../src/ui-currency.c:805 ../src/ui-pref.c:1391
 msgid "Currency"
-msgstr ""
+msgstr "币种"
 
-#: ../src/ui-currency.c:836 ../src/ui-pref.c:1410
+#: ../src/ui-currency.c:838 ../src/ui-pref.c:1436
 msgid "Format"
-msgstr ""
+msgstr "格式"
 
-#: ../src/ui-currency.c:845 ../src/ui-pref.c:1419 ../src/ui-pref.c:1489
+#: ../src/ui-currency.c:847 ../src/ui-pref.c:1445 ../src/ui-pref.c:1525
 msgid "_Customize"
-msgstr ""
+msgstr "自定义(_C)"
 
-#: ../src/ui-currency.c:854 ../src/ui-pref.c:1428
+#: ../src/ui-currency.c:856 ../src/ui-pref.c:1454
 msgid "_Symbol:"
-msgstr ""
+msgstr "符号(_S)："
 
-#: ../src/ui-currency.c:861 ../src/ui-pref.c:1435
+#: ../src/ui-currency.c:863 ../src/ui-pref.c:1461
 msgid "Is pre_fix"
 msgstr ""
 
-#: ../src/ui-currency.c:866 ../src/ui-pref.c:1440
+#: ../src/ui-currency.c:868 ../src/ui-pref.c:1466
 msgid "_Decimal char:"
 msgstr ""
 
-#: ../src/ui-currency.c:873 ../src/ui-pref.c:1447
+#: ../src/ui-currency.c:875 ../src/ui-pref.c:1473
 msgid "_Frac digits:"
 msgstr "小数位数(_F)："
 
-#: ../src/ui-currency.c:880 ../src/ui-pref.c:1454
+#: ../src/ui-currency.c:882 ../src/ui-pref.c:1480
 msgid "_Grouping char:"
 msgstr ""
 
-#: ../src/ui-currency.c:1040
+#: ../src/ui-currency.c:1142
 msgid "Select base currency"
 msgstr ""
 
-#: ../src/ui-currency.c:1040
+#: ../src/ui-currency.c:1142
 msgid "Select currency"
 msgstr ""
 
-#: ../src/ui-currency.c:1112
+#: ../src/ui-currency.c:1214
 msgid "ISO Code"
+msgstr "ISO 码"
+
+#: ../src/ui-currency.c:1222
+msgid "Add a custom _currency"
 msgstr ""
 
-#: ../src/ui-currency.c:1168
-msgid "Update online error"
+#: ../src/ui-currency.c:1235
+msgid "_ISO:"
 msgstr ""
 
-#: ../src/ui-currency.c:1301
+#: ../src/ui-currency.c:1320
+msgid "Update online error"
+msgstr "在线升级错误"
+
+#: ../src/ui-currency.c:1541
 msgid "If you delete a currency, it will be permanently lost."
 msgstr ""
 
-#: ../src/ui-currency.c:1345
+#: ../src/ui-currency.c:1585
 msgid "Change the base currency"
 msgstr ""
 
-#: ../src/ui-currency.c:1346
+#: ../src/ui-currency.c:1586
 msgid ""
 "If you proceed, rates of other currencies\n"
 "will be set to 0, don't forget to update it"
 msgstr ""
 
-#: ../src/ui-currency.c:1461
+#: ../src/ui-currency.c:1655
 msgid "Currencies"
-msgstr ""
+msgstr "货币"
 
-#: ../src/ui-currency.c:1511
+#: ../src/ui-currency.c:1705
 msgid "Update online"
-msgstr ""
+msgstr "在线升级"
 
-#: ../src/ui-currency.c:1543
+#: ../src/ui-currency.c:1738
 msgid "Set as base"
 msgstr ""
 
-#: ../src/ui-dialogs.c:176
+#: ../src/ui-dialogs.c:180
 msgid "File statistics"
-msgstr ""
+msgstr "文件信息"
+
+#: ../src/ui-dialogs.c:220
+msgid "Transaction"
+msgstr "交易"
 
-#: ../src/ui-dialogs.c:243
+#: ../src/ui-dialogs.c:247
 msgid "Assignment"
-msgstr ""
+msgstr "分配"
 
-#: ../src/ui-dialogs.c:324
+#: ../src/ui-dialogs.c:331
 msgid "Upgrade"
-msgstr ""
+msgstr "升级"
 
-#: ../src/ui-dialogs.c:349
+#: ../src/ui-dialogs.c:364
 msgid "Select a base currency"
-msgstr ""
+msgstr "选择基本货币"
 
-#: ../src/ui-dialogs.c:358
+#: ../src/ui-dialogs.c:373
 msgid ""
 "Starting v5.1, HomeBank can manage several currencies\n"
 "if the currency below is not correct, please change it:"
 msgstr ""
 
-#: ../src/ui-dialogs.c:475
+#: ../src/ui-dialogs.c:498
 msgid "Import from CSV"
 msgstr "导入 CSV 文件"
 
-#: ../src/ui-dialogs.c:537
+#: ../src/ui-dialogs.c:566
 msgid "Open HomeBank file"
+msgstr "打开 HomeBank 文件"
+
+#: ../src/ui-dialogs.c:566
+msgid "Open HomeBank backup file"
 msgstr ""
 
-#: ../src/ui-dialogs.c:542
+#: ../src/ui-dialogs.c:571
 msgid "Save HomeBank file as"
-msgstr ""
+msgstr "另存为"
 
-#: ../src/ui-dialogs.c:553
+#: ../src/ui-dialogs.c:589 ../src/ui-pref.c:1893
 msgid "HomeBank files"
 msgstr "家庭理财文件(.xhb)"
 
-#: ../src/ui-dialogs.c:655
+#: ../src/ui-dialogs.c:600
+msgid "File backup"
+msgstr ""
+
+#: ../src/ui-dialogs.c:604
+msgid "All backups"
+msgstr ""
+
+#: ../src/ui-dialogs.c:712
 msgid "Save changes to the file before closing?"
 msgstr ""
 
-#: ../src/ui-dialogs.c:659
+#: ../src/ui-dialogs.c:716
 #, c-format
 msgid ""
 "If you don't save, changes will be permanently lost.\n"
 "Number of changes: %d."
 msgstr ""
 
-#: ../src/ui-dialogs.c:664
+#: ../src/ui-dialogs.c:721
 msgid "Close _without saving"
+msgstr "不保存关闭(_w)"
+
+#: ../src/ui-dialogs.c:769
+msgid "Export as PDF"
+msgstr ""
+
+#: ../src/ui-dialogs.c:773
+msgid "Export as _PDF"
+msgstr ""
+
+#: ../src/ui-dialogs.c:806
+msgid "Folder:"
+msgstr ""
+
+#: ../src/ui-dialogs.c:808
+msgid "Pick a Folder"
+msgstr ""
+
+#: ../src/ui-dialogs.c:812
+msgid "Filename:"
 msgstr ""
 
-#: ../src/ui-dialogs.c:748
+#: ../src/ui-dialogs.c:915
 msgid "Select among possible transactions..."
 msgstr "从可能的记账中选择"
 
-#: ../src/ui-dialogs.c:784
+#: ../src/ui-dialogs.c:954
 msgid "Select an action:"
 msgstr ""
 
-#: ../src/ui-dialogs.c:788
+#: ../src/ui-dialogs.c:958
 msgid "create a new transaction"
 msgstr "创建新记账"
 
-#: ../src/ui-dialogs.c:791
+#: ../src/ui-dialogs.c:961
 msgid "select an existing transaction"
 msgstr "选择已有记账"
 
-#: ../src/ui-dialogs.c:796
+#: ../src/ui-dialogs.c:966
 msgid ""
 "HomeBank has found some transaction that may be the associated transaction "
 "for the internal transfer."
 msgstr "HomeBank发现一些记账与内部转账关联"
 
-#: ../src/ui-filter.c:52
-msgid "Any Type"
-msgstr "任意类型"
-
-#: ../src/ui-filter.c:57
-msgid "Uncategorized"
-msgstr "未分类"
-
-#: ../src/ui-filter.c:58
-msgid "Unreconciled"
-msgstr "未对帐"
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:301 ../src/ui-filter.c:1474
+msgid "Categories"
+msgstr "类别"
 
-#: ../src/ui-filter.c:59
-msgid "Uncleared"
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:446 ../src/ui-filter.c:1478
+msgid "Payees"
 msgstr ""
 
-#: ../src/ui-filter.c:60 ../src/ui-transaction.c:59
-msgid "Reconciled"
-msgstr ""
+#: ../src/ui-filter.c:1033 ../src/ui-filter.c:1055 ../src/ui-filter.c:1079
+#: ../src/ui-filter.c:1153 ../src/ui-filter.c:1203 ../src/ui-filter.c:1256
+#: ../src/ui-filter.c:1295 ../src/ui-filter.c:1355
+msgid "_Option:"
+msgstr "选项(_O)："
 
-#: ../src/ui-filter.c:61 ../src/ui-transaction.c:58
-msgid "Cleared"
-msgstr ""
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:1160 ../src/ui-filter.c:1454
+msgid "Dates"
+msgstr "日期"
 
-#: ../src/ui-filter.c:63
-msgid "Any Status"
-msgstr "任何状态"
+#: ../src/ui-filter.c:1177
+msgid "_Month:"
+msgstr "月(_M)："
 
-#: ../src/ui-filter.c:68
-msgid "This month"
-msgstr ""
+#: ../src/ui-filter.c:1183
+msgid "_Year:"
+msgstr "年(_Y)："
 
-#: ../src/ui-filter.c:69
-msgid "Last month"
-msgstr ""
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:1210 ../src/ui-filter.c:1470
+msgid "Texts"
+msgstr "文本"
 
-#: ../src/ui-filter.c:70
-msgid "This quarter"
-msgstr ""
+#: ../src/ui-filter.c:1222 ../src/ui-transaction.c:1255
+#: ../src/ui-txn-multi.c:480
+msgid "_Info:"
+msgstr "信息(_I)："
 
-#: ../src/ui-filter.c:71
-msgid "Last quarter"
-msgstr ""
+#: ../src/ui-filter.c:1238
+msgid "Case _sensitive"
+msgstr "区分大小写(_S)"
 
-#: ../src/ui-filter.c:72
-msgid "This year"
-msgstr ""
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:1263 ../src/ui-filter.c:1466
+msgid "Amounts"
+msgstr "金额"
 
-#: ../src/ui-filter.c:73
-msgid "Last year"
-msgstr ""
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:1302 ../src/ui-filter.c:1458
+msgid "Statuses"
+msgstr "状态"
 
-#: ../src/ui-filter.c:75
-msgid "Last 30 days"
-msgstr "最近30天"
+#: ../src/ui-filter.c:1311
+msgid "reconciled"
+msgstr "已对账"
 
-#: ../src/ui-filter.c:76
-msgid "Last 60 days"
-msgstr "最近60天"
+#: ../src/ui-filter.c:1315
+msgid "cleared"
+msgstr "已清空"
 
-#: ../src/ui-filter.c:77
-msgid "Last 90 days"
-msgstr "最近90天"
+#: ../src/ui-filter.c:1320
+msgid "Force:"
+msgstr "强制："
 
-#: ../src/ui-filter.c:78
-msgid "Last 12 months"
-msgstr "最近12个月"
+#: ../src/ui-filter.c:1328
+msgid "display 'Added'"
+msgstr "显示“已添加”"
 
-#: ../src/ui-filter.c:80
-msgid "Other..."
-msgstr "其它…"
+#: ../src/ui-filter.c:1332
+msgid "display 'Edited'"
+msgstr "显示“已编辑”"
 
-#: ../src/ui-filter.c:82
-msgid "All date"
-msgstr "所有日期"
+#: ../src/ui-filter.c:1336
+msgid "display 'Remind'"
+msgstr ""
 
-#: ../src/ui-filter.c:90
-msgid "All month"
-msgstr "所有月份"
+#. gtk_widget_show(GTK_WIDGET(page));
+#: ../src/ui-filter.c:1362 ../src/ui-filter.c:1462
+msgid "Payments"
+msgstr "付款方式"
 
-#: ../src/ui-filter.c:750 ../src/ui-filter.c:799 ../src/ui-filter.c:848
-#: ../src/ui-filter.c:953 ../src/ui-filter.c:1007 ../src/ui-filter.c:1064
-#: ../src/ui-filter.c:1110 ../src/ui-filter.c:1170
-msgid "_Option:"
-msgstr "选项(_O)："
+#: ../src/ui-hbfile.c:239
+msgid "Scheduled transaction"
+msgstr ""
 
-#: ../src/ui-filter.c:771 ../src/ui-filter.c:820 ../src/ui-filter.c:869
-msgid "All"
-msgstr "全部"
-
-#: ../src/ui-filter.c:775 ../src/ui-filter.c:824 ../src/ui-filter.c:873
-#: ../src/ui-pref.c:106 ../src/ui-transaction.c:57
-msgid "None"
-msgstr "无"
-
-#: ../src/ui-filter.c:779 ../src/ui-filter.c:828 ../src/ui-filter.c:877
-msgid "Invert"
-msgstr "反向选择"
-
-#: ../src/ui-filter.c:949
-msgid "Filter Date"
-msgstr ""
-
-#: ../src/ui-filter.c:976
-msgid "_Month:"
-msgstr "月(_M)："
-
-#: ../src/ui-filter.c:982
-msgid "_Year:"
-msgstr "年(_Y)："
-
-#: ../src/ui-filter.c:1003
-msgid "Filter Text"
-msgstr ""
-
-#: ../src/ui-filter.c:1016
-msgid "Case _sensitive"
-msgstr "区分大小写(_S)"
-
-#: ../src/ui-filter.c:1035
-msgid "_Tag:"
-msgstr "标签(_T)："
-
-#: ../src/ui-filter.c:1060
-msgid "Filter Amount"
-msgstr ""
-
-#: ../src/ui-filter.c:1106
-msgid "Filter Status"
-msgstr ""
-
-#: ../src/ui-filter.c:1121
-msgid "reconciled"
-msgstr "已对账"
-
-#: ../src/ui-filter.c:1125
-msgid "cleared"
-msgstr ""
-
-#: ../src/ui-filter.c:1130
-msgid "Force:"
-msgstr "强制："
-
-#: ../src/ui-filter.c:1136
-msgid "display 'Added'"
-msgstr "显示“已添加”"
-
-#: ../src/ui-filter.c:1140
-msgid "display 'Edited'"
-msgstr "显示“已编辑”"
-
-#: ../src/ui-filter.c:1144
-msgid "display 'Remind'"
-msgstr ""
-
-#: ../src/ui-filter.c:1165
-msgid "Filter Payment"
-msgstr ""
-
-#: ../src/ui-filter.c:1265
-msgid "Edit Filter"
-msgstr "编辑过滤器"
-
-#. clear button
-#: ../src/ui-filter.c:1268 ../src/ui-pref.c:1998
-msgid "_Reset"
-msgstr ""
-
-#: ../src/ui-filter.c:1312
-msgid "Payment"
-msgstr ""
-
-#: ../src/ui-hbfile.c:239
-msgid "Scheduled transaction"
-msgstr ""
-
-#: ../src/ui-hbfile.c:243
-msgid "add until"
-msgstr "添加直到"
+#: ../src/ui-hbfile.c:243
+msgid "add until"
+msgstr "添加直到"
 
 #: ../src/ui-hbfile.c:251
 msgid "of each month (excluded)"
@@ -2741,29 +2683,30 @@ msgid "add"
 msgstr "添加"
 
 #. TRANSLATORS: there is a spinner on the left of this label, and so you have 0....x days in advance the current date
-#: ../src/ui-hbfile.c:265 ../src/ui-pref.c:1592
+#: ../src/ui-hbfile.c:265
 msgid "days in advance the current date"
 msgstr "提前N天"
 
-#: ../src/ui-payee.c:705
-msgid "Default category"
-msgstr ""
-
-#: ../src/ui-payee.c:743
+#: ../src/ui-payee.c:1037
 msgid "Delete unused payee"
-msgstr ""
+msgstr "删除未使用的收款人"
 
-#: ../src/ui-payee.c:744
+#: ../src/ui-payee.c:1038
 msgid ""
 "Are you sure you want to\n"
 "permanently delete unused payee?"
-msgstr ""
+msgstr "你确定你想永久删除未使用的付款人？"
 
-#: ../src/ui-payee.c:909
+#: ../src/ui-payee.c:1218
 msgid "Default"
-msgstr ""
+msgstr "默认"
+
+#: ../src/ui-payee.c:1230 ../src/ui-transaction.c:1239
+#: ../src/ui-txn-multi.c:466
+msgid "Pa_yment:"
+msgstr "支付(_y)"
 
-#: ../src/ui-payee.c:966
+#: ../src/ui-payee.c:1277
 #, c-format
 msgid ""
 "Cannot rename this Payee,\n"
@@ -2774,52 +2717,64 @@ msgstr ""
 "从 '%s' 到 '%s'，\n"
 "这个名字已经存在了。"
 
-#: ../src/ui-payee.c:1021
+#: ../src/ui-payee.c:1332
 #, c-format
 msgid "Merge payee '%s'"
 msgstr ""
 
-#: ../src/ui-payee.c:1042
+#: ../src/ui-payee.c:1353
 msgid ""
 "Transactions assigned to this payee,\n"
 "will be moved to the payee selected below."
 msgstr ""
 
-#: ../src/ui-payee.c:1052
+#: ../src/ui-payee.c:1363
 #, c-format
 msgid "_Delete the payee '%s'"
 msgstr ""
 
-#: ../src/ui-payee.c:1139
+#: ../src/ui-payee.c:1454 ../src/ui-tag.c:600
 msgid ""
 "This payee is used.\n"
 "Any transaction using that payee will be set to (no payee)"
 msgstr ""
 
-#: ../src/ui-payee.c:1219
+#: ../src/ui-payee.c:1547
 msgid "Manage Payees"
 msgstr "管理交易人"
 
-#: ../src/ui-payee.c:1289
+#: ../src/ui-payee.c:1657
 msgid "new payee"
 msgstr ""
 
-#: ../src/ui-pref.c:87
+#: ../src/ui-pref.c:85
 msgid "Interface"
 msgstr "界面"
 
-#: ../src/ui-pref.c:89
-msgid "Display format"
-msgstr "显示格式"
+#: ../src/ui-pref.c:86
+msgid "Locale"
+msgstr ""
 
-#: ../src/ui-pref.c:90
+#: ../src/ui-pref.c:87
+msgid "Transactions"
+msgstr "è®°è´¦"
+
+#: ../src/ui-pref.c:88
 msgid "Import/Export"
 msgstr "导入/导出"
 
-#: ../src/ui-pref.c:91
+#: ../src/ui-pref.c:89
 msgid "Report"
 msgstr "报表"
 
+#: ../src/ui-pref.c:90 ../src/ui-pref.c:1845
+msgid "Backup"
+msgstr ""
+
+#: ../src/ui-pref.c:91
+msgid "Folders"
+msgstr ""
+
 #: ../src/ui-pref.c:97
 msgid "System defaults"
 msgstr "系统默认值"
@@ -2842,15 +2797,15 @@ msgstr "文字在图标旁"
 
 #: ../src/ui-pref.c:107
 msgid "Horizontal"
-msgstr ""
+msgstr "水平显示"
 
 #: ../src/ui-pref.c:108
 msgid "Vertical"
-msgstr ""
+msgstr "垂直显示"
 
 #: ../src/ui-pref.c:109
 msgid "Both"
-msgstr ""
+msgstr "兼有"
 
 #: ../src/ui-pref.c:116
 msgid "Tango light"
@@ -2876,112 +2831,136 @@ msgstr "日-月-年"
 msgid "y-m-d"
 msgstr "年-月-日"
 
-#: ../src/ui-pref.c:136
+#: ../src/ui-pref.c:130 ../src/ui-pref.c:138
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/ui-pref.c:137
+#: ../src/ui-pref.c:139
 msgid "Append to Info"
 msgstr "添加到信息"
 
-#: ../src/ui-pref.c:138
+#: ../src/ui-pref.c:140
 msgid "Append to Memo"
 msgstr "添加到提示"
 
-#: ../src/ui-pref.c:504
+#: ../src/ui-pref.c:141
+msgid "Append to Payee"
+msgstr ""
+
+#: ../src/ui-pref.c:146
+msgid "Tab"
+msgstr ""
+
+#: ../src/ui-pref.c:147
+msgid "Comma"
+msgstr ""
+
+#: ../src/ui-pref.c:148
+msgid "Semicolon"
+msgstr ""
+
+#: ../src/ui-pref.c:149
+msgid "Space"
+msgstr ""
+
+#: ../src/ui-pref.c:486
 msgid "System Language"
 msgstr "系统语言"
 
-#: ../src/ui-pref.c:629
+#: ../src/ui-pref.c:647
 msgid "Choose a default HomeBank files folder"
-msgstr ""
+msgstr "选择一个默认的 HomeBank 档案文件夹"
 
-#: ../src/ui-pref.c:634
+#: ../src/ui-pref.c:652
 msgid "Choose a default import folder"
 msgstr ""
 
-#: ../src/ui-pref.c:639
+#: ../src/ui-pref.c:657
 msgid "Choose a default export folder"
 msgstr ""
 
-#: ../src/ui-pref.c:1122
-msgid "Date options"
+#: ../src/ui-pref.c:1144
+msgid "General options"
 msgstr ""
 
-#: ../src/ui-pref.c:1126
-msgid "Date order:"
-msgstr "日期顺序:"
-
-#: ../src/ui-pref.c:1141
+#: ../src/ui-pref.c:1168
 msgid "OFX/QFX options"
 msgstr ""
 
-#: ../src/ui-pref.c:1145
-msgid "_Memo field:"
-msgstr "备注字段(_M)"
+#: ../src/ui-pref.c:1195
+msgid "QIF options"
+msgstr "QIF 选项"
 
-#: ../src/ui-pref.c:1160 ../src/ui-pref.c:1830
-msgid "Files folder"
+#: ../src/ui-pref.c:1212
+msgid "CSV options"
 msgstr ""
 
-#: ../src/ui-pref.c:1164
-msgid "_Import:"
-msgstr "导入(_I)："
+#: ../src/ui-pref.c:1216
+msgid "(transaction import only)"
+msgstr ""
 
-#: ../src/ui-pref.c:1183
-msgid "_Export:"
-msgstr "导出(_E)："
+#: ../src/ui-pref.c:1220
+msgid "Separator:"
+msgstr ""
 
-#: ../src/ui-pref.c:1254
+#: ../src/ui-pref.c:1280
 msgid "Initial filter"
 msgstr ""
 
-#: ../src/ui-pref.c:1258 ../src/ui-pref.c:1575 ../src/ui-pref.c:1818
-msgid "Date _range:"
-msgstr "日期范围(_r)"
-
-#: ../src/ui-pref.c:1272
+#: ../src/ui-pref.c:1298
 msgid "Charts options"
 msgstr ""
 
-#: ../src/ui-pref.c:1276
+#: ../src/ui-pref.c:1302
 msgid "Color scheme:"
-msgstr ""
+msgstr "配色方案:"
 
-#: ../src/ui-pref.c:1298
+#: ../src/ui-pref.c:1324
 msgid "Statistics options"
-msgstr ""
+msgstr "统计选项"
 
-#: ../src/ui-pref.c:1302
+#: ../src/ui-pref.c:1328
 msgid "Show by _amount"
 msgstr "显示金额(_A)"
 
-#: ../src/ui-pref.c:1307
+#: ../src/ui-pref.c:1333
 msgid "Show _rate column"
 msgstr "显示百分比(_R)"
 
-#: ../src/ui-pref.c:1312 ../src/ui-pref.c:1326
+#: ../src/ui-pref.c:1338 ../src/ui-pref.c:1352
 msgid "Show _details"
 msgstr "显示明细(_D)"
 
-#: ../src/ui-pref.c:1322
+#: ../src/ui-pref.c:1348
 msgid "Budget options"
 msgstr ""
 
-#: ../src/ui-pref.c:1354
+#: ../src/ui-pref.c:1380
 msgid "_Enable"
 msgstr "启用(_E)"
 
 #. row++;
-#: ../src/ui-pref.c:1375 ../src/ui-pref.c:1709
+#: ../src/ui-pref.c:1401 ../src/ui-pref.c:1789
 msgid "_Preset:"
 msgstr "预设(_P)："
 
-#: ../src/ui-pref.c:1498
-msgid "_Format:"
+#: ../src/ui-pref.c:1506
+msgid "User interface"
 msgstr ""
 
-#: ../src/ui-pref.c:1511
+#: ../src/ui-pref.c:1510
+msgid "_Language:"
+msgstr "语言(_L)："
+
+#: ../src/ui-pref.c:1518
+msgid "_Date display:"
+msgstr ""
+
+#: ../src/ui-pref.c:1534
+msgid "_Format:"
+msgstr "格式："
+
+#: ../src/ui-pref.c:1547
 msgid ""
 "%a locale's abbreviated weekday name.\n"
 "%A locale's full weekday name. \n"
@@ -2998,206 +2977,243 @@ msgid ""
 "%m month as a decimal number [01,12]. \n"
 "%p locale's appropriate date representation. \n"
 "%y year without century as a decimal number [00,99]. \n"
-"%Y year with century as a decimal number. \n"
-msgstr ""
-"%a 地区的缩写星期名 \n"
-"%A 地区的完整星期名。 \n"
-"%b 地区的缩写月份名。 \n"
-"%B 地区的完整月份名。 \n"
-"%c 地区的日期及时间代表。 \n"
-"%C 世纪名的十进制数[00-99]。 \n"
-"%d 日期的时间指数[01,31]。 \n"
-"%D 与%m/%d/%y相同。 \n"
-"%e 日期的十进制数[1,31]; 个位数日期前添加空格。 \n"
-"%j 日期在一年中序号[001,366]。 \n"
-"%m 月份的十进制数[01,12]。 \n"
-"%p 地区的日期表示。 \n"
-"%y 年份的最后两位数[00,99]。 \n"
-"%Y 年份的四位数表示。 \n"
-
-#: ../src/ui-pref.c:1538
+"%Y year with century as a decimal number."
+msgstr ""
+
+#: ../src/ui-pref.c:1577
+msgid "Fiscal year"
+msgstr "会计年度"
+
+#. TRANSLATORS: (fiscal year) starts on
+#: ../src/ui-pref.c:1582
+msgid "Starts _on:"
+msgstr ""
+
+#: ../src/ui-pref.c:1602
 msgid "Measurement units"
 msgstr ""
 
-#: ../src/ui-pref.c:1542
+#: ../src/ui-pref.c:1606
 msgid "Use _miles for meter"
 msgstr ""
 
-#: ../src/ui-pref.c:1547
+#: ../src/ui-pref.c:1611
 msgid "Use _gallon for fuel"
 msgstr ""
 
-#: ../src/ui-pref.c:1571
+#: ../src/ui-pref.c:1635
 msgid "Transaction window"
 msgstr ""
 
-#: ../src/ui-pref.c:1583
-msgid "_Show:"
+#: ../src/ui-pref.c:1647
+msgid "_Show future:"
 msgstr ""
 
-#: ../src/ui-pref.c:1596
+#. TRANSLATORS: there is a spinner on the left of this label, and so you have 0....x days in advance the current date
+#: ../src/ui-pref.c:1656
+msgid "days ahead"
+msgstr ""
+
+#: ../src/ui-pref.c:1660
 msgid "Hide reconciled transactions"
 msgstr "隐藏已对账记账"
 
-#: ../src/ui-pref.c:1601
+#: ../src/ui-pref.c:1665
 msgid "Always show remind transactions"
 msgstr ""
 
-#: ../src/ui-pref.c:1611
+#: ../src/ui-pref.c:1675
 msgid "Multiple add"
 msgstr ""
 
-#: ../src/ui-pref.c:1615
+#: ../src/ui-pref.c:1679
 msgid "Keep the last date"
 msgstr "保留最新日期"
 
-#: ../src/ui-pref.c:1625
-msgid "Column list"
+#: ../src/ui-pref.c:1689
+msgid "Memo autocomplete"
 msgstr ""
 
-#: ../src/ui-pref.c:1638
-msgid "Drag & drop to change the order"
-msgstr "拖放更改顺序"
+#: ../src/ui-pref.c:1693
+msgid "Active"
+msgstr ""
 
-#: ../src/ui-pref.c:1665
-msgid "_Language:"
-msgstr "语言(_L)："
+#: ../src/ui-pref.c:1701
+msgid "rolling days"
+msgstr ""
 
-#: ../src/ui-pref.c:1672
+#: ../src/ui-pref.c:1752
 msgid "_Toolbar:"
 msgstr "工具栏(_T)："
 
 #. widget = gtk_check_button_new_with_mnemonic (_("Enable rows in alternating colors"));
 #. data->CM_ruleshint = widget;
-#: ../src/ui-pref.c:1682
+#: ../src/ui-pref.c:1768
 msgid "_Grid line:"
 msgstr ""
 
-#: ../src/ui-pref.c:1694
+#: ../src/ui-pref.c:1780
 msgid "Amount colors"
 msgstr ""
 
-#: ../src/ui-pref.c:1698
+#: ../src/ui-pref.c:1784
 msgid "Uses custom colors"
 msgstr "使用自定义颜色"
 
-#: ../src/ui-pref.c:1718
+#: ../src/ui-pref.c:1799
 msgid "_Expense:"
 msgstr "支出(_E)："
 
-#: ../src/ui-pref.c:1728
+#: ../src/ui-pref.c:1811
 msgid "_Income:"
 msgstr "收入(_I)："
 
-#: ../src/ui-pref.c:1735
+#: ../src/ui-pref.c:1818
 msgid "_Warning:"
 msgstr "提醒(_W)："
 
-#: ../src/ui-pref.c:1762
+#: ../src/ui-pref.c:1849
+msgid "_Enable automatic backups"
+msgstr ""
+
+#: ../src/ui-pref.c:1854
+msgid "_Number of backups to keep:"
+msgstr ""
+
+#: ../src/ui-pref.c:1869
+msgid "Backup frequency is once a day"
+msgstr ""
+
+#: ../src/ui-pref.c:1897
+msgid "_Wallets:"
+msgstr ""
+
+#: ../src/ui-pref.c:1921
+msgid "Exchange files"
+msgstr ""
+
+#: ../src/ui-pref.c:1925
+msgid "_Import:"
+msgstr "导入(_I)："
+
+#: ../src/ui-pref.c:1944
+msgid "_Export:"
+msgstr "导出(_E)："
+
+#: ../src/ui-pref.c:1984
 msgid "Program start"
 msgstr ""
 
-#: ../src/ui-pref.c:1766
+#: ../src/ui-pref.c:1988
 msgid "Show splash screen"
 msgstr "显示启动画面"
 
-#: ../src/ui-pref.c:1771
+#: ../src/ui-pref.c:1993
 msgid "Load last opened file"
 msgstr "自动打开上次的财务文档"
 
-#: ../src/ui-pref.c:1781
+#: ../src/ui-pref.c:2003
 msgid "Update currencies online"
 msgstr ""
 
-#: ../src/ui-pref.c:1791
-msgid "Fiscal year"
-msgstr ""
-
-#. TRANSLATORS: (fiscal year) starts on
-#: ../src/ui-pref.c:1796
-msgid "Starts _on:"
-msgstr ""
-
-#: ../src/ui-pref.c:1814
+#: ../src/ui-pref.c:2014
 msgid "Main window reports"
-msgstr ""
-
-#: ../src/ui-pref.c:1834
-msgid "_Default:"
-msgstr "默认(_D)："
+msgstr "主窗口图表"
 
-#: ../src/ui-pref.c:1939
-msgid "Reset all preferences"
+#: ../src/ui-pref.c:2113
+msgid "Reset All Preferences"
 msgstr ""
 
-#: ../src/ui-pref.c:1940
+#: ../src/ui-pref.c:2114
 msgid ""
-"Do you really want to reset all\n"
-"preferences to default values?"
+"Do you really want to reset\n"
+"all preferences to default\n"
+"values?"
 msgstr ""
 
-#: ../src/ui-pref.c:1941
-msgid "Reset"
-msgstr ""
-
-#: ../src/ui-pref.c:1959
+#: ../src/ui-pref.c:2133
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../src/ui-pref.c:2181
+#: ../src/ui-pref.c:2366
 msgid ""
 "You will have to restart HomeBank\n"
 "for the language change to take effect."
 msgstr "语言设置在下次重启后生效"
 
-#: ../src/ui-split.c:374
-msgid "_Remove"
+#: ../src/ui-split.c:778
+msgid "Remove all"
 msgstr ""
 
-#. sum button must appear only when new split add
-#. #1258821
-#. if(data.splittype == TXN_SPLIT_NEW)
-#: ../src/ui-split.c:379
-msgid "Sum"
-msgstr "总数"
+#: ../src/ui-split.c:782
+msgid "Remove"
+msgstr ""
 
-#: ../src/ui-split.c:464
-msgid "Sum of splits:"
-msgstr "拆分的总数"
+#: ../src/ui-split.c:828
+msgid "Apply"
+msgstr ""
 
-#: ../src/ui-split.c:475
-msgid "Unassigned:"
-msgstr "未分配:"
+#: ../src/ui-split.c:832
+msgid "Cancel"
+msgstr ""
 
-#: ../src/ui-split.c:490
+#: ../src/ui-split.c:840
 msgid "Transaction amount:"
 msgstr "记账金额"
 
-#: ../src/ui-transaction.c:50
+#: ../src/ui-split.c:849
+msgid "Unassigned:"
+msgstr "未分配:"
+
+#: ../src/ui-split.c:864
+msgid "Sum of splits:"
+msgstr "拆分的总数"
+
+#: ../src/ui-tag.c:553
+#, c-format
+msgid ""
+"Cannot rename this Tag,\n"
+"from '%s' to '%s',\n"
+"this name already exists."
+msgstr ""
+
+#: ../src/ui-tag.c:678
+msgid "Manage Tags"
+msgstr ""
+
+#: ../src/ui-tag.c:745
+msgid "new tag"
+msgstr ""
+
+#: ../src/ui-transaction.c:49
 msgid "Add transaction"
 msgstr "添加记账"
 
-#: ../src/ui-transaction.c:51
+#: ../src/ui-transaction.c:50
 msgid "Inherit transaction"
 msgstr "套用记账"
 
-#: ../src/ui-transaction.c:52
+#: ../src/ui-transaction.c:51
 msgid "Modify transaction"
 msgstr "修改记账"
 
-#: ../src/ui-transaction.c:60
-msgid "Remind"
-msgstr ""
+#: ../src/ui-transaction.c:57 ../src/ui-widgets-data.c:148
+msgid "Cleared"
+msgstr "已清除"
 
-#: ../src/ui-transaction.c:558
+#: ../src/ui-transaction.c:58 ../src/ui-widgets-data.c:147
+msgid "Reconciled"
+msgstr "已核对"
+
+#: ../src/ui-transaction.c:658
 msgid "From acc_ount:"
 msgstr ""
 
-#: ../src/ui-transaction.c:562 ../src/ui-transaction.c:987
+#: ../src/ui-transaction.c:662 ../src/ui-transaction.c:1230
 msgid "To acc_ount:"
 msgstr "到账户(_o)"
 
-#: ../src/ui-transaction.c:642
+#: ../src/ui-transaction.c:752
 msgid ""
 "Do you want to break the internal transfer ?\n"
 "\n"
@@ -3207,97 +3223,336 @@ msgstr ""
 "\n"
 "继续将删除目标记账。"
 
-#: ../src/ui-transaction.c:870 ../src/ui-widgets.c:273
-msgid "Search..."
+#: ../src/ui-transaction.c:754
+msgid "_Break"
 msgstr ""
 
-#: ../src/ui-transaction.c:906
+#: ../src/ui-transaction.c:1003
 msgid "Show _scheduled"
 msgstr ""
 
-#: ../src/ui-transaction.c:930
+#: ../src/ui-transaction.c:1007
+msgid "Show _all accounts"
+msgstr ""
+
+#: ../src/ui-transaction.c:1033
+msgid "Use a _template"
+msgstr "使用模板(_T)"
+
+#: ../src/ui-transaction.c:1144
+msgid "_Add & keep"
+msgstr "添加并继续"
+
+#: ../src/ui-transaction.c:1152
+msgid "_Post"
+msgstr "发布(_P)"
+
+#: ../src/ui-transaction.c:1185 ../src/ui-txn-multi.c:418
 msgid "_Date:"
 msgstr "日期(_D)："
 
-#: ../src/ui-transaction.c:936
+#. gtk_widget_set_tooltip_text(widget, _("Date accepted here are:\nday,\nday/month or month/day,\nand complete date into your locale"));
+#: ../src/ui-transaction.c:1192
 msgid ""
-"Date accepted here are:\n"
-"day,\n"
-"day/month or month/day,\n"
-"and complete date into your locale"
+"- type: d, d/m, m/d a complete date\n"
+"- use arrow key + ctrl or shift\n"
+"- empty for today"
 msgstr ""
-"有效的日期格式：\n"
-"日，\n"
-"日/月 或者 月/日，\n"
-"或者本地化设置中设定的完整日期"
 
-#: ../src/ui-transaction.c:1002 ../src/ui-transaction.c:1011
+#. widget = gtk_image_new_from_icon_name (ICONNAME_INFO, GTK_ICON_SIZE_BUTTON);
+#. gtk_widget_set_tooltip_text(widget, _("Autocompletion and direct seizure\nis available"));
+#: ../src/ui-transaction.c:1288 ../src/ui-transaction.c:1301
 msgid ""
-"Autocompletion and direct seizure\n"
-"is available"
+"- type some letter for autocompletion\n"
+"- type new text to create entry"
 msgstr ""
 
-#: ../src/ui-transaction.c:1105
-msgid "_Add & keep"
-msgstr ""
+#: ../src/ui-transaction.c:1311 ../src/ui-txn-multi.c:528
+msgid "M_emo:"
+msgstr "备注(_e)"
 
-#: ../src/ui-transaction.c:1113
-msgid "_Post"
+#: ../src/ui-transaction.c:1339
+msgid "Warning: amount and category sign don't match"
 msgstr ""
 
-#: ../src/ui-transaction.c:1157
-msgid "Use a _template"
+#: ../src/ui-txn-multi.c:403
+msgid "Multiple edit transactions"
+msgstr "编辑多个交易"
+
+#: ../src/ui-widgets-data.c:29
+msgid "Template"
+msgstr "模版"
+
+#: ../src/ui-widgets-data.c:57
+msgid "Inactive"
+msgstr "不执行"
+
+#: ../src/ui-widgets-data.c:58
+msgid "Include"
+msgstr "包含"
+
+#: ../src/ui-widgets-data.c:59
+msgid "Exclude"
+msgstr "排除"
+
+#: ../src/ui-widgets-data.c:71
+msgid "(no type)"
+msgstr "(缺少类型)"
+
+#: ../src/ui-widgets-data.c:73 ../src/ui-widgets.c:1070
+msgid "Cash"
+msgstr "现金"
+
+#: ../src/ui-widgets-data.c:74
+msgid "Asset"
+msgstr "资产"
+
+#: ../src/ui-widgets-data.c:75 ../src/ui-widgets.c:1068
+msgid "Credit card"
+msgstr "信用卡"
+
+#: ../src/ui-widgets-data.c:76
+msgid "Liability"
+msgstr "负债"
+
+#: ../src/ui-widgets-data.c:90
+msgid "This month"
+msgstr "本月"
+
+#: ../src/ui-widgets-data.c:91
+msgid "Last month"
+msgstr "上个月"
+
+#: ../src/ui-widgets-data.c:92
+msgid "This quarter"
+msgstr "这个季度"
+
+#: ../src/ui-widgets-data.c:93
+msgid "Last quarter"
+msgstr "上个季度"
+
+#: ../src/ui-widgets-data.c:94
+msgid "This year"
+msgstr "今年"
+
+#: ../src/ui-widgets-data.c:95
+msgid "Last year"
+msgstr "去年"
+
+#: ../src/ui-widgets-data.c:97
+msgid "Last 30 days"
+msgstr "最近30天"
+
+#: ../src/ui-widgets-data.c:98
+msgid "Last 60 days"
+msgstr "最近60天"
+
+#: ../src/ui-widgets-data.c:99
+msgid "Last 90 days"
+msgstr "最近90天"
+
+#: ../src/ui-widgets-data.c:100
+msgid "Last 12 months"
+msgstr "最近12个月"
+
+#. { FLT_RANGE_OTHER,			N_("Other...") },
+#: ../src/ui-widgets-data.c:103
+msgid "custom"
 msgstr ""
 
-#: ../src/ui-transaction.c:1201
-msgid "Warning: amount and category sign don't match"
+#: ../src/ui-widgets-data.c:105
+msgid "All date"
+msgstr "所有日期"
+
+#: ../src/ui-widgets-data.c:120
+msgid "Possible"
+msgstr "可能的"
+
+#: ../src/ui-widgets-data.c:121
+msgid "Before"
+msgstr "之前"
+
+#: ../src/ui-widgets-data.c:122
+msgid "After"
+msgstr "之后"
+
+#: ../src/ui-widgets-data.c:139
+msgid "Any Type"
+msgstr "任意类型"
+
+#: ../src/ui-widgets-data.c:144
+msgid "Uncategorized"
+msgstr "未分类"
+
+#: ../src/ui-widgets-data.c:145
+msgid "Unreconciled"
+msgstr "未对帐"
+
+#: ../src/ui-widgets-data.c:146
+msgid "Uncleared"
 msgstr ""
 
-#: ../src/ui-widgets.c:799
+#: ../src/ui-widgets-data.c:150
+msgid "Any Status"
+msgstr "任何状态"
+
+#: ../src/ui-widgets-data.c:177
+msgid "All month"
+msgstr "所有月份"
+
+#: ../src/ui-widgets-data.c:178 ../src/ui-widgets-data.c:199
+msgid "January"
+msgstr "1月"
+
+#: ../src/ui-widgets-data.c:179 ../src/ui-widgets-data.c:200
+msgid "February"
+msgstr "2月"
+
+#: ../src/ui-widgets-data.c:180 ../src/ui-widgets-data.c:201
+msgid "March"
+msgstr "3月"
+
+#: ../src/ui-widgets-data.c:181 ../src/ui-widgets-data.c:202
+msgid "April"
+msgstr "4月"
+
+#: ../src/ui-widgets-data.c:182 ../src/ui-widgets-data.c:203
+#: ../src/ui-widgets-data.c:223
+msgid "May"
+msgstr "5月"
+
+#: ../src/ui-widgets-data.c:183 ../src/ui-widgets-data.c:204
+msgid "June"
+msgstr "6月"
+
+#: ../src/ui-widgets-data.c:184 ../src/ui-widgets-data.c:205
+msgid "July"
+msgstr "7月"
+
+#: ../src/ui-widgets-data.c:185 ../src/ui-widgets-data.c:206
+msgid "August"
+msgstr "8月"
+
+#: ../src/ui-widgets-data.c:186 ../src/ui-widgets-data.c:207
+msgid "September"
+msgstr "9月"
+
+#: ../src/ui-widgets-data.c:187 ../src/ui-widgets-data.c:208
+msgid "October"
+msgstr "10月"
+
+#: ../src/ui-widgets-data.c:188 ../src/ui-widgets-data.c:209
+msgid "November"
+msgstr "11月"
+
+#: ../src/ui-widgets-data.c:189 ../src/ui-widgets-data.c:210
+msgid "December"
+msgstr "12月"
+
+#: ../src/ui-widgets-data.c:219
+msgid "Jan"
+msgstr "1月"
+
+#: ../src/ui-widgets-data.c:220
+msgid "Feb"
+msgstr "2月"
+
+#: ../src/ui-widgets-data.c:221
+msgid "Mar"
+msgstr "3月"
+
+#: ../src/ui-widgets-data.c:222
+msgid "Apr"
+msgstr "4月"
+
+#: ../src/ui-widgets-data.c:224
+msgid "Jun"
+msgstr "6月"
+
+#: ../src/ui-widgets-data.c:225
+msgid "Jul"
+msgstr "7月"
+
+#: ../src/ui-widgets-data.c:226
+msgid "Aug"
+msgstr "8月"
+
+#: ../src/ui-widgets-data.c:227
+msgid "Sep"
+msgstr "9月"
+
+#: ../src/ui-widgets-data.c:228
+msgid "Oct"
+msgstr "10月"
+
+#: ../src/ui-widgets-data.c:229
+msgid "Nov"
+msgstr "11月"
+
+#: ../src/ui-widgets-data.c:230
+msgid "Dec"
+msgstr "12月"
+
+#: ../src/ui-widgets.c:311
+msgid "Search..."
+msgstr "搜索..."
+
+#: ../src/ui-widgets.c:1069
 msgid "Check"
 msgstr "支票"
 
-#: ../src/ui-widgets.c:801
+#: ../src/ui-widgets.c:1071
 msgid "Transfer"
 msgstr "转账"
 
-#: ../src/ui-widgets.c:802
+#: ../src/ui-widgets.c:1072
 msgid "Internal transfer"
 msgstr "内部转帐"
 
-#: ../src/ui-widgets.c:803
+#: ../src/ui-widgets.c:1073
 msgid "Debit card"
 msgstr "借记卡"
 
-#: ../src/ui-widgets.c:804
+#: ../src/ui-widgets.c:1074
 msgid "Standing order"
 msgstr "定期转账"
 
-#: ../src/ui-widgets.c:805
+#: ../src/ui-widgets.c:1075
 msgid "Electronic payment"
 msgstr "电子付款"
 
-#: ../src/ui-widgets.c:806
+#: ../src/ui-widgets.c:1076
 msgid "Deposit"
 msgstr "存款"
 
 #. TRANSLATORS: Financial institution fee
-#: ../src/ui-widgets.c:808
+#: ../src/ui-widgets.c:1078
 msgid "FI fee"
 msgstr "费用"
 
-#: ../src/ui-widgets.c:809
+#: ../src/ui-widgets.c:1079
 msgid "Direct Debit"
-msgstr ""
-
-#: ../src/ui-widgets.c:937
-msgid "Inactive"
-msgstr "不执行"
-
-#: ../src/ui-widgets.c:938
-msgid "Include"
-msgstr "包含"
-
-#: ../src/ui-widgets.c:939
-msgid "Exclude"
-msgstr "排除"
+msgstr "直接记账"
+
+#~ msgid ""
+#~ "Date accepted here are:\n"
+#~ "day,\n"
+#~ "day/month or month/day,\n"
+#~ "and complete date into your locale"
+#~ msgstr ""
+#~ "有效的日期格式：\n"
+#~ "日，\n"
+#~ "日/月 或者 月/日，\n"
+#~ "或者本地化设置中设定的完整日期"
+
+#~ msgid "Other..."
+#~ msgstr "其它…"
+
+#~ msgid "Check internal transfert result"
+#~ msgstr "检查内部传输结果"
+
+#~ msgid "Date options"
+#~ msgstr "日期选项"
+
+#~ msgid "Default category"
+#~ msgstr "默认类别"