[glom] Update Chinese (China) translation



commit e80ee88c348cd87dff51dc7ac321cf277f11352d
Author: Boyuan Yang <073plan gmail com>
Date:   Fri Jul 9 16:36:12 2021 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 4017 ++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 2349 insertions(+), 1668 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ff62c3c..e73d85b4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,237 +4,87 @@
 # Funda Wang <fundawang linux net cn>, 2004.
 # Yinghua Wang <wantinghard gmail com>, 2010.
 # Aron Xu <aronxu gnome org>, 2010.
+# Junping Sun <junping nfschina com>, 2021.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glom master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=glom&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-01-13 13:25+0000\n"
-"PO-Revision-Date: 2012-01-15 20:31+0800\n"
-"Last-Translator: Aron Xu <happyaron xu gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/glom/issues\n";
+"POT-Creation-Date: 2020-09-04 11:10+0000\n"
+"PO-Revision-Date: 2021-07-09 09:51+0800\n"
+"Last-Translator: Junping Sun <junping nfschina com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: ../glom/application.cc:145
+#: ../glom/application.cc:159 ../glom/glom_create_from_example.cc:260
+#: ../glom/glom_export_po.cc:112 ../glom/glom_export_po_all.cc:100
+#: ../glom/glom_import_po_all.cc:102 ../glom/glom_test_connection.cc:148
+msgid "Error while parsing command-line options: "
+msgstr "解析命令行选项时出错:"
+
+#. TODO: How can we just print them out?
+#: ../glom/application.cc:160 ../glom/glom_create_from_example.cc:261
+#: ../glom/glom_export_po.cc:113 ../glom/glom_export_po_all.cc:101
+#: ../glom/glom_import_po_all.cc:103 ../glom/glom_test_connection.cc:108
+msgid "Use --help to see a list of available command-line options."
+msgstr "使用 --help 查看可用命令行选项的清单。"
+
+#: ../glom/application.cc:201 ../glom/glom_create_from_example.cc:295
+#: ../glom/glom_export_po.cc:162
+msgid "Glom: The file does not exist."
+msgstr "Glom:该文件不存在。"
+
+#: ../glom/application.cc:211 ../glom/glom_create_from_example.cc:305
+#: ../glom/glom_export_po.cc:172
+msgid "Glom: The file path is a directory instead of a file."
+msgstr "Glom:该文件路径是一个目录而非一个文件。"
+
+#: ../glom/appwindow.cc:178
 msgid "Glom: Generating Encryption Certificates"
 msgstr "Glom:生成加密证书"
 
-#: ../glom/application.cc:146
+#: ../glom/appwindow.cc:179
 msgid ""
 "Please wait while Glom prepares your system for publishing over the network."
 msgstr "请稍等,Glom 正在为网络发布准备您的系统。"
 
-#: ../glom/application.cc:266 ../glom/bakery/app_withdoc_gtk.cc:228
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:198
-#: ../glom/mode_design/relationships_overview/dialog_relationships_overview.cc:58
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../glom/application.cc:267 ../glom/bakery/app_withdoc_gtk.cc:229
-msgid "_Recent Files"
-msgstr "最近的文件(_R)"
-
-#: ../glom/application.cc:275
-msgid "_Save as Example"
-msgstr "保存为示例(_S)"
-
-#: ../glom/application.cc:282 ../glom/filechooser_export.cc:41
-msgid "_Export"
-msgstr "导出(_E)"
-
-#: ../glom/application.cc:286 ../ui/operator/dialog_import_csv.glade.h:6
-msgid "I_mport"
-msgstr "导入(_M)"
-
-#: ../glom/application.cc:291
-msgid "S_hared on Network"
-msgstr "在网络上共享(_H)"
-
-#: ../glom/application.cc:305
-msgid "_Standard"
-msgstr "标准(_S)"
-
-#: ../glom/application.cc:309
-msgid "_Edit Print Layouts"
-msgstr "编辑打印布局(_E)"
-
-#. "Tables" menu:
-#: ../glom/application.cc:367
-msgid "_Tables"
-msgstr "表(_T)"
-
-#: ../glom/application.cc:377
-msgid "_Edit Tables"
-msgstr "编辑表(_E)"
-
-#. "Reports" menu:
-#: ../glom/application.cc:391
-msgid "_Reports"
-msgstr "报表(_R)"
-
-#: ../glom/application.cc:394
-msgid "_Edit Reports"
-msgstr "编辑报表(_E)"
-
-#. We remember this action, so that it can be explicitly activated later.
-#: ../glom/application.cc:402 ../glom/frame_glom.cc:123
-msgid "_Find"
-msgstr "查找(_F)"
-
-#: ../glom/application.cc:408
-msgctxt "Developer menu title"
-msgid "_Developer"
-msgstr "开发者(_D)"
-
-#: ../glom/application.cc:414
-msgid "_Developer Mode"
-msgstr "开发者模式(_D)"
-
-#: ../glom/application.cc:418
-msgid "_Operator Mode"
-msgstr "操作员模式(_O)"
-
-#: ../glom/application.cc:423
-msgid "_Database Preferences"
-msgstr "数据库首选项(_D)"
-
-#: ../glom/application.cc:428
-msgid "_Fields"
-msgstr "字段(_F)"
-
-#: ../glom/application.cc:433
-msgid "Relationships _Overview"
-msgstr "关系概览(_O)"
-
-#: ../glom/application.cc:438
-msgid "_Relationships for this Table"
-msgstr "该表的关系(_R)"
-
-#: ../glom/application.cc:443
-msgid "_Users"
-msgstr "用户(_U)"
-
-#: ../glom/application.cc:447
-msgid "_Print Layouts"
-msgstr "打印布局(_P)"
-
-#: ../glom/application.cc:452
-msgid "R_eports"
-msgstr "报表(_E)"
-
-#: ../glom/application.cc:457
-msgid "Script _Library"
-msgstr "脚本库(_L)"
-
-#: ../glom/application.cc:462
-msgid "_Layout"
-msgstr "布局(_L)"
-
-#: ../glom/application.cc:467
-msgid "Test Tra_nslation"
-msgstr "测试翻译(_N)"
-
-#: ../glom/application.cc:471
-msgid "_Translations"
-msgstr "翻译(_T)"
-
-#. "Active Platform" menu:
-#: ../glom/application.cc:477
-msgid "_Active Platform"
-msgstr "活动平台(_A)"
-
-#: ../glom/application.cc:483
-msgid "_Normal"
-msgstr "正常(_N)"
-
-#: ../glom/application.cc:483
-msgid "The layout to use for normal desktop environments."
-msgstr "用于正常的桌面环境的布局。"
-
-#: ../glom/application.cc:488
-msgid "_Maemo"
-msgstr "_Maemo"
-
-#: ../glom/application.cc:488
-msgid "The layout to use for Maemo devices."
-msgstr "用于 Maemo 设备的布局。"
-
-#: ../glom/application.cc:493
-msgid "_Export Backup"
-msgstr "导出备份(_E)"
-
-#: ../glom/application.cc:497
-msgid "_Restore Backup"
-msgstr "恢复备份(_R)"
-
-#. TODO: Think of a better name for this menu item,
-#. though it mostly only exists because it is not quite ready to be on by default:
-#. Note to translators: Drag and Drop is part of the name, not a verb or action:
-#: ../glom/application.cc:504
-msgid "_Drag and Drop Layout"
-msgstr "拖放布局(_D)"
-
-#: ../glom/application.cc:512
-msgctxt "Help menu title"
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../glom/application.cc:516
-msgid "_Help"
-msgstr "帮助(_H)"
-
-#: ../glom/application.cc:519
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../glom/application.cc:519
-msgid "About the application"
-msgstr "关于该应用程序"
-
-#: ../glom/application.cc:522
-msgid "_Contents"
-msgstr "目录(_C)"
-
-#: ../glom/application.cc:522
-msgid "Help with the application"
-msgstr "此应用程序的帮助"
-
-#: ../glom/application.cc:627
+#: ../glom/appwindow.cc:465
 msgid "A Database GUI"
 msgstr "一个数据库图形用户界面"
 
-#: ../glom/application.cc:629
+#: ../glom/appwindow.cc:467
 msgid "© 2000-2011 Murray Cumming, Openismus GmbH"
 msgstr "© 2000-2011 Murray Cumming, Openismus GmbH"
 
 #. TODO: Put this in the generic bakery code.
-#: ../glom/application.cc:713 ../glom/application.cc:722
+#: ../glom/appwindow.cc:576 ../glom/appwindow.cc:585
 msgid "Open Failed"
 msgstr "打开失败"
 
-#: ../glom/application.cc:714
+#: ../glom/appwindow.cc:577
 msgid "The document could not be found."
 msgstr "找不到该文档。"
 
-#: ../glom/application.cc:723
+#: ../glom/appwindow.cc:586
 msgid ""
 "The document could not be opened because it was created or modified by a "
 "newer version of Glom."
 msgstr "无法打开该文档,因为它是新版本的 Glom 创建或修改过的。"
 
-#. std::cout << "   SOUP_STATUS_FORBIDDEN or SOUP_STATUS_UNAUTHORIZED" << std::endl;
+#. std::cout << "   SOUP_STATUS_FORBIDDEN or SOUP_STATUS_UNAUTHORIZED\n";
+#. This can only happen if we couldn't connect to the server at all.
 #. Warn the user, and let him try again:
-#: ../glom/application.cc:773 ../glom/frame_glom.cc:2037
-#: ../glom/frame_glom.cc:2108
+#: ../glom/appwindow.cc:642 ../glom/frame_glom.cc:1994
+#: ../glom/frame_glom.cc:2063
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../glom/application.cc:773 ../glom/frame_glom.cc:2037
-#: ../glom/frame_glom.cc:2108
+#: ../glom/appwindow.cc:642 ../glom/frame_glom.cc:1994
+#: ../glom/frame_glom.cc:2063
 msgid ""
 "Glom could not connect to the database server. Maybe you entered an "
 "incorrect user name or password, or maybe the postgres database server is "
@@ -243,35 +93,35 @@ msgstr ""
 "Glom 无法连接到数据库服务器。可能您输入了错误的用户名或密码,或者 postgres 数"
 "据库服务器没有运行。"
 
-#: ../glom/application.cc:937
+#: ../glom/appwindow.cc:809
 msgid ""
 "The file cannot be opened because this version of Glom does not support self-"
 "hosting of databases."
 msgstr ""
 "无法打开该文件,因为此版本的 Glom 不支持数据库的自我宿主(self-hosting)。"
 
-#: ../glom/application.cc:942 ../glom/application.cc:951
+#: ../glom/appwindow.cc:814 ../glom/appwindow.cc:823
 msgid ""
 "The file cannot be opened because this version of Glom does not support "
 "PostgreSQL databases."
 msgstr "无法打开该文件,因为此版本的 Glom 不支持 PostgreSQL 数据库。"
 
-#: ../glom/application.cc:959
+#: ../glom/appwindow.cc:831
 msgid ""
 "The file cannot be opened because this version of Glom does not support "
 "SQLite databases."
 msgstr "无法打开该文件,因为此版本的 Glom 不支持 SQLite 数据库。"
 
 #. Warn the user.
-#: ../glom/application.cc:977
+#: ../glom/appwindow.cc:849
 msgid "File Uses Unsupported Database Backend"
 msgstr "文件使用了不支持的数据库后端"
 
-#: ../glom/application.cc:1037
+#: ../glom/appwindow.cc:915
 msgid "Creating From Example File"
 msgstr "从示例文件创建"
 
-#: ../glom/application.cc:1038
+#: ../glom/appwindow.cc:916
 msgid ""
 "To use this example file you must save an editable copy of the file. A new "
 "database will also be created on the server."
@@ -279,11 +129,11 @@ msgstr ""
 "要使用该示例文件,您必须保存一份可编辑的文件副本。服务器上也会创建一个新数据"
 "库。"
 
-#: ../glom/application.cc:1042
+#: ../glom/appwindow.cc:920
 msgid "Creating From Backup File"
 msgstr "从备份文件创建"
 
-#: ../glom/application.cc:1043
+#: ../glom/appwindow.cc:921
 msgid ""
 "To use this backup file you must save an editable copy of the file. A new "
 "database will also be created on the server."
@@ -291,26 +141,84 @@ msgstr ""
 "要使用该备份文件,您必须保存一份可编辑的文件副本。服务器上也会创建一个新数据"
 "库。"
 
-#: ../glom/application.cc:1104
+#: ../glom/appwindow.cc:982
 msgid "Opening Read-Only File."
 msgstr "打开只读文件。"
 
-#: ../glom/application.cc:1105
+#: ../glom/appwindow.cc:983
 msgid ""
 "This file is read only, so you will not be able to enter Developer mode to "
 "make design changes."
 msgstr "该文件是只读的。因此您不能进入开发者模式修改设计。"
 
-#: ../glom/application.cc:1108
+#: ../glom/appwindow.cc:985 ../glom/appwindow.cc:2111 ../glom/appwindow.cc:2390
+#: ../glom/appwindow.cc:2427 ../glom/appwindow.cc:2802
+#: ../glom/base_db_table_data.cc:378 ../glom/box_withbuttons.cc:37
+#: ../glom/box_withbuttons.cc:51 ../glom/box_withbuttons.cc:65
+#: ../glom/dialog_existing_or_new.cc:786 ../glom/filechooser_export.cc:40
+#: ../glom/frame_glom.cc:516 ../glom/frame_glom.cc:602
+#: ../glom/frame_glom.cc:689 ../glom/frame_glom.cc:795 ../glom/utils_ui.cc:490
+#: ../glom/onlineglom_strings.cc:40 ../glom/bakery/dialog_offersave.cc:57
+#: ../glom/main.cc:266 ../glom/main.cc:322
+#: ../glom/mode_design/fields/box_db_table_definition.cc:294
+#: ../glom/mode_design/fields/box_db_table_definition.cc:345
+#: ../glom/mode_design/layout/layout_item_dialogs/dialog_formatting.cc:38
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:221
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:840
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:884
+#: ../glom/mode_design/script_library/dialog_script_library.cc:126
+#: ../glom/navigation/box_tables.cc:315 ../glom/navigation/box_tables.cc:419
+#: ../glom/mode_design/translation/window_translations.cc:353
+#: ../glom/mode_design/translation/window_translations.cc:392
+#: ../glom/utility_widgets/imageglom.cc:695
+#: ../glom/utility_widgets/imageglom.cc:782
+#: ../data/ui/operator/dialog_choose_date.glade.h:3
+#: ../data/ui/operator/dialog_connection.glade.h:3
+#: ../data/ui/operator/dialog_find_id.glade.h:2
+#: ../data/ui/operator/dialog_image_load_progress.glade.h:2
+#: ../data/ui/operator/dialog_image_save_progress.glade.h:2
+#: ../data/ui/operator/dialog_import_csv.glade.h:2
+#: ../data/ui/operator/dialog_import_csv_progress.glade.h:3
+#: ../data/ui/developer/dialog_add_related_table.glade.h:2
+#: ../data/ui/developer/dialog_change_language.glade.h:3
+#: ../data/ui/developer/dialog_choose_field.glade.h:2
+#: ../data/ui/developer/dialog_choose_relationship.glade.h:2
+#: ../data/ui/developer/dialog_choose_user.glade.h:3
+#: ../data/ui/developer/dialog_database_preferences.glade.h:3
+#: ../data/ui/developer/dialog_fieldslist.glade.h:2
+#: ../data/ui/developer/dialog_field_summary.glade.h:2
+#: ../data/ui/developer/dialog_flowtable.glade.h:2
+#: ../data/ui/developer/dialog_group_by.glade.h:2
+#: ../data/ui/developer/dialog_initial_password.glade.h:3
+#: ../data/ui/developer/dialog_line.glade.h:3
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:2
+#: ../data/ui/developer/dialog_new_group.glade.h:3
+#: ../data/ui/developer/dialog_new_library_script.glade.h:3
+#: ../data/ui/developer/dialog_notebook.glade.h:3
+#: ../data/ui/developer/dialog_sort_fields.glade.h:3
+#: ../data/ui/developer/dialog_translation_copy.glade.h:3
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:3
+#: ../data/ui/developer/dialog_user.glade.h:3
+#: ../data/ui/developer/window_button_script.glade.h:3
+#: ../data/ui/developer/window_default_formatting.glade.h:2
+#: ../data/ui/developer/window_field_calculation.glade.h:3
+#: ../data/ui/developer/window_field_definition_edit.glade.h:16
+#: ../data/ui/developer/window_imageobject.glade.h:3
+#: ../data/ui/developer/window_textobject.glade.h:3
+#: ../data/ui/developer/window_translations.glade.h:10
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../glom/appwindow.cc:986
 msgid "Continue without Developer Mode"
 msgstr "继续而不使用开发者模式"
 
 #. The connection to the server is OK, but the database is not there yet.
-#: ../glom/application.cc:1166
+#: ../glom/appwindow.cc:1045
 msgid "Database Not Found On Server"
 msgstr "服务器上找不到数据库"
 
-#: ../glom/application.cc:1166
+#: ../glom/appwindow.cc:1045
 msgid ""
 "The database could not be found on the server. Please consult your system "
 "administrator."
@@ -318,72 +226,101 @@ msgstr "服务器上找不到该数据库。请咨询您的系统管理员。"
 
 #. std::cerr might show some hints, but we don't want to confront the user with them:
 #. TODO: Actually complain about specific stuff such as missing data, because the user might really play 
with the file system.
-#: ../glom/application.cc:1176
+#: ../glom/appwindow.cc:1055
 msgid "Problem Loading Document"
 msgstr "载入文档出现问题"
 
-#: ../glom/application.cc:1176
+#: ../glom/appwindow.cc:1055
 msgid "Glom could not load the document."
 msgstr "Glom 无法载入该文档。"
 
-#: ../glom/application.cc:1606
+#: ../glom/appwindow.cc:1498
 msgid "Creating Glom database from example file."
 msgstr "正在从示例文件创建 Glom 数据库。"
 
-#: ../glom/application.cc:1785
+#: ../glom/appwindow.cc:1642
 msgid "Creating Glom database from backup file."
 msgstr "正在从备份文件创建 Glom 数据库。"
 
+#: ../glom/appwindow.cc:1701
+#, fuzzy
+#| msgid ""
+#| "<span weight=\"bold\" size=\"larger\">Database creation failed</span>\n"
+#| "\n"
+#| "Glom could not create the new database. Maybe you do not have the "
+#| "necessary access rights. Please contact your system administrator."
+msgid ""
+"Glom could not create the new database. Maybe you do not have the necessary "
+"access rights. Please contact your system administrator."
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">数据库创建失败</span>\n"
+"\n"
+"Glom 无法创建新数据库。或许您不具备访问权限。请联系您的系统管理员。"
+
+#: ../glom/appwindow.cc:1702
+#, fuzzy
+#| msgid "Database Field"
+msgid "Database Creation Failed"
+msgstr "数据库字段"
+
 #. The save failed. Tell the user and don't do anything else:
-#: ../glom/application.cc:2258 ../glom/bakery/app_withdoc.cc:237
-#: ../glom/bakery/app_withdoc.cc:288
+#: ../glom/appwindow.cc:2083 ../glom/bakery/appwindow_withdoc.cc:226
+#: ../glom/bakery/appwindow_withdoc.cc:270
 msgid "Save failed."
 msgstr "保存失败。"
 
-#: ../glom/application.cc:2258
+#: ../glom/appwindow.cc:2083
 msgid "There was an error while saving the example file."
 msgstr "在保存示例文件时出现了一个错误。"
 
-#: ../glom/application.cc:2299 ../glom/application.cc:2304
-#: ../glom/bakery/app_withdoc_gtk.cc:425
+#: ../glom/appwindow.cc:2098 ../glom/appwindow.cc:2103
 msgid "Save Document"
 msgstr "保存文档"
 
+#: ../glom/appwindow.cc:2112 ../glom/appwindow.cc:2391
+#: ../glom/bakery/dialog_offersave.cc:58
+#: ../glom/mode_design/layout/layout_item_dialogs/dialog_formatting.cc:39
+#: ../glom/utility_widgets/imageglom.cc:696
+#: ../data/ui/developer/window_default_formatting.glade.h:3
+#: ../data/ui/developer/window_field_definition_edit.glade.h:17
+msgid "_Save"
+msgstr "保存(_S)"
+
 #. Warn the user:
-#: ../glom/application.cc:2391 ../glom/bakery/app_withdoc_gtk.cc:473
+#: ../glom/appwindow.cc:2189
 msgid "Read-only File."
 msgstr "只读文件。"
 
-#: ../glom/application.cc:2391 ../glom/bakery/app_withdoc_gtk.cc:473
+#: ../glom/appwindow.cc:2189
 msgid ""
 "You may not overwrite the existing file, because you do not have sufficient "
 "access rights."
 msgstr "您不能覆盖已存在的文件,因为您没有足够的访问权限。"
 
 #. Warn the user:
-#: ../glom/application.cc:2405 ../glom/bakery/app_withdoc_gtk.cc:487
+#: ../glom/appwindow.cc:2203
 msgid "Read-only Directory."
 msgstr "只读目录。"
 
-#: ../glom/application.cc:2405 ../glom/bakery/app_withdoc_gtk.cc:487
+#: ../glom/appwindow.cc:2203
 msgid ""
 "You may not create a file in this directory, because you do not have "
 "sufficient access rights."
 msgstr "您不能在此目录中创建文件,因为您没有足够的访问权限。"
 
-#: ../glom/application.cc:2422
+#: ../glom/appwindow.cc:2220
 msgid "Database Title missing"
 msgstr "缺少数据库标题"
 
-#: ../glom/application.cc:2422
+#: ../glom/appwindow.cc:2220
 msgid "You must specify a title for the new database."
 msgstr "您必须为这个新数据库指定一个标题。"
 
-#: ../glom/application.cc:2451 ../glom/frame_glom.cc:1797
+#: ../glom/appwindow.cc:2254 ../glom/frame_glom.cc:1770
 msgid "Directory Already Exists"
 msgstr "目录已存在"
 
-#: ../glom/application.cc:2451 ../glom/frame_glom.cc:1798
+#: ../glom/appwindow.cc:2254 ../glom/frame_glom.cc:1771
 msgid ""
 "There is an existing directory with the same name as the directory that "
 "should be created for the new database files. You should specify a different "
@@ -393,63 +330,80 @@ msgstr ""
 "来使用一个新目录。"
 
 #. This actually creates the directory:
-#: ../glom/application.cc:2590
+#: ../glom/appwindow.cc:2389
 msgid "Save Backup"
 msgstr "保存备份"
 
-#: ../glom/application.cc:2606
+#: ../glom/appwindow.cc:2405
 msgid "Exporting backup"
 msgstr "导出备份"
 
-#: ../glom/application.cc:2612
+#: ../glom/appwindow.cc:2411
 msgid "Export Backup failed."
 msgstr "导出备份失败。"
 
-#: ../glom/application.cc:2612
+#: ../glom/appwindow.cc:2411
 msgid "There was an error while exporting the backup."
 msgstr "在导出备份时出现了一个错误。"
 
-#: ../glom/application.cc:2618
+#: ../glom/appwindow.cc:2417
 msgid "Choose a backup file"
 msgstr "选择备份文件"
 
-#: ../glom/application.cc:2623
+#: ../glom/appwindow.cc:2422
 msgid ".tar.gz Backup files"
 msgstr ".tar.gz 备份文件"
 
-#: ../glom/application.cc:2629
+#: ../glom/appwindow.cc:2428
 msgid "Restore"
 msgstr "恢复"
 
-#: ../glom/application.cc:2654
+#: ../glom/appwindow.cc:2453
 msgid "Restoring backup"
 msgstr "恢复备份"
 
-#: ../glom/application.cc:2661
+#: ../glom/appwindow.cc:2460
 msgid "Restore Backup failed."
 msgstr "恢复备份失败。"
 
-#: ../glom/application.cc:2661
-msgid "There was an error while restoring the backup."
-msgstr "在恢复备份时出现了一个错误。"
+#: ../glom/appwindow.cc:2460
+#, fuzzy
+#| msgid "There was an error while exporting the backup."
+msgid "There was an error while extracting the backup."
+msgstr "在导出备份时出现了一个错误。"
 
-#: ../glom/application.cc:2758 ../glom/bakery/app_withdoc_gtk.cc:346
+#: ../glom/appwindow.cc:2567
 msgid " (read-only)"
 msgstr " (只读)"
 
-#: ../glom/application.cc:2806 ../ui/operator/window_main.glade.h:2
+#: ../glom/appwindow.cc:2615 ../data/ui/operator/window_main.glade.h:2
 msgid "Processing"
 msgstr "正在处理"
 
-#: ../glom/base_db.cc:128 ../glom/base_db.cc:138
+#: ../glom/appwindow.cc:2801
+msgid "Open Document"
+msgstr "打开文档"
+
+#. Add a button for related record navigation:
+#: ../glom/appwindow.cc:2803 ../glom/dialog_existing_or_new.cc:787
+#: ../glom/frame_glom.cc:603 ../glom/onlineglom_strings.cc:32
+#: ../glom/utility_widgets/adddel/adddel_withbuttons.cc:35
+#: ../glom/utility_widgets/adddel/adddel_withbuttons.cc:45
+#: ../glom/mode_data/datawidget/datawidget.cc:223
+#: ../glom/mode_data/db_adddel/db_adddel_withbuttons.cc:32
+#: ../data/ui/operator/window_main.glade.h:5
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: ../glom/base_db.cc:105 ../glom/base_db.cc:118
 msgid "Internal error"
 msgstr "内部错误"
 
-#: ../glom/base_db.cc:1461
+#: ../glom/base_db.cc:1124
 msgid "Value Is Not Unique"
 msgstr "值不惟一"
 
-#: ../glom/base_db.cc:1461
+#: ../glom/base_db.cc:1124
 msgid ""
 "The field's value must be unique, but a record with this value already "
 "exists."
@@ -457,7 +411,7 @@ msgstr "字段的值必须惟一,而已经有一个含有这个值的记录了
 
 #. Warn the user:
 #. TODO: Make the field insensitive until it can receive data, so people never see this dialog.
-#: ../glom/base_db_table_data.cc:262
+#: ../glom/base_db_table_data.cc:243
 msgid ""
 "Data may not be entered into this related field, because the related record "
 "does not yet exist, and the relationship does not allow automatic creation "
@@ -466,13 +420,13 @@ msgstr ""
 "数据不能填入此相关字段中,因为该相关字段尚不存在,关系也不允许自动创建新的相"
 "关记录。"
 
-#: ../glom/base_db_table_data.cc:263
+#: ../glom/base_db_table_data.cc:244
 msgid "Related Record Does Not Exist"
 msgstr "相关记录不存在"
 
 #. Warn the user:
 #. TODO: Make the field insensitive until it can receive data, so people never see this dialog.
-#: ../glom/base_db_table_data.cc:282
+#: ../glom/base_db_table_data.cc:263
 msgid ""
 "Data may not be entered into this related field, because the related record "
 "does not yet exist, and the key in the related record is auto-generated and "
@@ -481,117 +435,176 @@ msgstr ""
 "数据不能填入此相关字段中,因为该相关字段尚不存在,而且相关记录中的键是自动生"
 "成的,因而不能使用此记录中的键值创建。"
 
-#: ../glom/base_db_table_data.cc:284
+#: ../glom/base_db_table_data.cc:265
 msgid "Related Record Cannot Be Created"
 msgstr "相关记录无法创建"
 
 #. Ask the user for confirmation:
-#: ../glom/base_db_table_data.cc:395
+#: ../glom/base_db_table_data.cc:374
 msgid ""
 "Are you sure that you would like to delete this record? The data in this "
 "record will then be permanently lost."
 msgstr "您确定要删除此记录吗?删除后记录中的数据将永远丢失。"
 
-#: ../glom/base_db_table_data.cc:396
+#: ../glom/base_db_table_data.cc:375
 msgid "Delete record"
 msgstr "删除记录"
 
+#: ../glom/base_db_table_data.cc:379 ../glom/mode_data/box_data_details.cc:49
+#: ../glom/mode_design/users/dialog_groups_list.cc:85
+#: ../glom/print_layout/canvas_print_layout.cc:288
+#: ../glom/utility_widgets/adddel/adddel.cc:214
+#: ../glom/utility_widgets/adddel/adddel_withbuttons.cc:34
+#: ../glom/utility_widgets/adddel/adddel_withbuttons.cc:44
+#: ../glom/mode_data/db_adddel/db_adddel.cc:252
+#: ../glom/mode_data/db_adddel/db_adddel_withbuttons.cc:31
+#: ../glom/utility_widgets/layoutwidgetutils.cc:53
+#: ../glom/utility_widgets/notebooklabelglom.cc:118
+#: ../data/ui/developer/dialog_fieldslist.glade.h:7
+#: ../data/ui/developer/dialog_notebook.glade.h:7
+#: ../data/ui/developer/dialog_sort_fields.glade.h:8
+#: ../data/ui/developer/window_data_layout_export.glade.h:6
+#: ../data/ui/developer/window_data_layout.glade.h:25
+#: ../data/ui/developer/window_groups.glade.h:4
+#: ../data/ui/developer/window_print_layout_edit.glade.h:8
+#: ../data/ui/developer/window_report_layout.glade.h:18
+#: ../data/ui/developer/window_users.glade.h:6
+#, fuzzy
+#| msgid "Delete"
+msgid "_Delete"
+msgstr "删除"
+
 #. Append the View columns:
 #. Use set_cell_data_func() to give more control over the cell attributes depending on the row:
 #. Name column:
 #. Append the View columns:
-#: ../glom/box_reports.cc:93
-#: ../glom/mode_design/box_db_table_relationships.cc:44
-#: ../glom/mode_design/fields/box_db_table_definition.cc:53
-#: ../glom/mode_design/layout/dialog_choose_field.cc:54
+#: ../glom/box_reports.cc:104
+#: ../glom/mode_design/box_db_table_relationships.cc:47
+#: ../glom/mode_design/fields/box_db_table_definition.cc:64
+#: ../glom/mode_design/layout/dialog_choose_field.cc:60
 #: ../glom/mode_design/layout/dialog_choose_relationship.cc:55
-#: ../glom/mode_design/layout/dialog_layout_details.cc:102
+#: ../glom/mode_design/layout/dialog_layout_details.cc:104
 #: ../glom/mode_design/layout/layout_item_dialogs/dialog_fieldslist.cc:53
-#: ../glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc:48
 #: ../glom/mode_design/layout/layout_item_dialogs/dialog_sortfields.cc:52
-#: ../glom/mode_design/print_layouts/box_print_layouts.cc:93
-#: ../glom/mode_design/users/dialog_groups_list.cc:65
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:91
+#: ../glom/mode_design/users/dialog_groups_list.cc:66
 msgid "Name"
 msgstr "名称"
 
 #. Don't allow a relationship to be added twice.
-#: ../glom/box_reports.cc:95
+#: ../glom/box_reports.cc:106
 msgid "This report already exists. Please choose a different report name"
 msgstr "此报表已经存在。请另选一个报表名称"
 
 #. Title column:
-#: ../glom/box_reports.cc:97
-#: ../glom/mode_design/box_db_table_relationships.cc:48
-#: ../glom/mode_design/fields/box_db_table_definition.cc:57
-#: ../glom/mode_design/layout/dialog_choose_field.cc:55
-#: ../glom/mode_design/layout/dialog_layout_details.cc:115
-#: ../glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc:49
-#: ../glom/mode_design/print_layouts/box_print_layouts.cc:97
-#: ../glom/navigation/box_tables.cc:137
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:109
+#: ../glom/box_reports.cc:108
+#: ../glom/mode_design/box_db_table_relationships.cc:51
+#: ../glom/mode_design/fields/box_db_table_definition.cc:68
+#: ../glom/mode_design/layout/dialog_choose_field.cc:61
+#: ../glom/mode_design/layout/dialog_layout_details.cc:117
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:95
+#: ../glom/navigation/box_tables.cc:132
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:89
 msgid "Title"
 msgstr "标题"
 
-#: ../glom/box_reports.cc:225
+#: ../glom/box_reports.cc:234
 msgid "Are you sure that you want to rename this report?"
 msgstr "您确定要重命名报表吗?"
 
 #. TODO: Show old and new names?
-#: ../glom/box_reports.cc:226
+#: ../glom/box_reports.cc:235
 msgid "Rename Report"
 msgstr "重命名报表"
 
 #. namespace Glom
-#: ../glom.desktop.in.in.h:1
-msgid "A user-friendly database environment."
-msgstr "一个易操作的数据库环境。"
-
-#: ../glom.desktop.in.in.h:2 ../ui/operator/window_main.glade.h:1
+#: ../glom.appdata.xml.in.h:1 ../glom.desktop.in.in.h:1
+#: ../data/ui/operator/window_main.glade.h:1
 msgid "Glom"
 msgstr "Glom"
 
-#: ../glom/dialog_connection.cc:203
+#: ../glom.appdata.xml.in.h:2
+#, fuzzy
+#| msgid "Database User"
+msgid "Database user interface"
+msgstr "数据库用户"
+
+#: ../glom.appdata.xml.in.h:3
+msgid ""
+"With Glom you can design database systems - the database and the user "
+"interface."
+msgstr "使用 Glom,您可以设计数据库系统-数据库和用户界面。"
+
+#: ../glom.appdata.xml.in.h:4
+msgid ""
+"Glom has high-level features such as relationships, lookups, related fields, "
+"related records, calculated fields, drop-down choices, searching, reports, "
+"users and groups. It has simple Numeric, Text, Date, Time, Boolean, and "
+"Image field types."
+msgstr ""
+
+#: ../glom.appdata.xml.in.h:5
+msgid "The details view showing the whole record"
+msgstr ""
+
+#: ../glom.appdata.xml.in.h:6
+msgid "The list view showing all records in the table"
+msgstr ""
+
+#: ../glom.appdata.xml.in.h:7
+msgid "The details view showing records from a related table"
+msgstr ""
+
+#: ../glom.desktop.in.in.h:2
+#, fuzzy
+#| msgid "A user-friendly database environment."
+msgid "A user-friendly database environment"
+msgstr "一个易操作的数据库环境。"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
+#: ../glom.desktop.in.in.h:4
+msgid "database;ui;tables;postgresql;forms;"
+msgstr ""
+
+#: ../glom/dialog_connection.cc:195
 msgid "Not yet created."
 msgstr "尚未创建。"
 
-#: ../glom/dialog_existing_or_new.cc:49
-msgid "No recently used documents available."
-msgstr "没有最近使用的文档。"
-
-#: ../glom/dialog_existing_or_new.cc:50
+#: ../glom/dialog_existing_or_new.cc:51
 msgid "No sessions found on the local network."
 msgstr "局域网中未找到会话。"
 
-#: ../glom/dialog_existing_or_new.cc:53
-msgid "No templates available."
-msgstr "没有模板可用。"
-
-#: ../glom/dialog_existing_or_new.cc:111
+#: ../glom/dialog_existing_or_new.cc:119
 msgid "Open a Document"
 msgstr "打开文档"
 
-#: ../glom/dialog_existing_or_new.cc:130
+#: ../glom/dialog_existing_or_new.cc:138
+#: ../glom/utility_widgets/imageglom.cc:970
 msgid "Select File"
 msgstr "选择文件"
 
-#: ../glom/dialog_existing_or_new.cc:134
+#: ../glom/dialog_existing_or_new.cc:142
 msgid "Local Network"
 msgstr "局域网"
 
-#: ../glom/dialog_existing_or_new.cc:138
+#: ../glom/dialog_existing_or_new.cc:146
 msgid "Recently Opened"
 msgstr "最近打开的"
 
-#: ../glom/dialog_existing_or_new.cc:212
+#: ../glom/dialog_existing_or_new.cc:185
+msgid "No recently used documents available."
+msgstr "没有最近使用的文档。"
+
+#: ../glom/dialog_existing_or_new.cc:217
 msgid "New Empty Document"
 msgstr "新建空文档"
 
-#: ../glom/dialog_existing_or_new.cc:215
+#: ../glom/dialog_existing_or_new.cc:220
 msgid "New From Template"
 msgstr "从模板新建"
 
 #. Translator hint: This is <Service Name> on <Host> (via Network Interface such as eth0).
-#: ../glom/dialog_existing_or_new.cc:741
+#: ../glom/dialog_existing_or_new.cc:718
 #, c-format
 msgid "%s on %s (via %s)"
 msgstr "%2$s 上的 %1$s(使用 %3$s)"
@@ -604,23 +617,34 @@ msgstr "导出为文件"
 msgid "Define Data _Format"
 msgstr "定义数据格式(_F)"
 
-#: ../glom/frame_glom.cc:81
+#: ../glom/filechooser_export.cc:41 ../data/ui/operator/window_main.glade.h:7
+msgid "_Export"
+msgstr "导出(_E)"
+
+#: ../glom/frame_glom.cc:83
 msgid "Find All"
 msgstr "查找所有"
 
-#: ../glom/frame_glom.cc:102 ../glom/frame_glom.cc:106
+#: ../glom/frame_glom.cc:103 ../glom/frame_glom.cc:107
 msgid "No Table Selected"
 msgstr "没有选中表"
 
-#: ../glom/frame_glom.cc:113 ../ui/operator/dialog_find_id.glade.h:3
+#: ../glom/frame_glom.cc:114 ../data/ui/operator/dialog_find_id.glade.h:5
 msgid "Quick _search:"
 msgstr "快速搜索(_S):"
 
-#: ../glom/frame_glom.cc:137
+#: ../glom/frame_glom.cc:125 ../glom/mode_data/box_data.cc:42
+#: ../glom/mode_data/datawidget/datawidget.cc:233
+#: ../data/ui/operator/dialog_find_id.glade.h:6
+#: ../data/ui/operator/window_main.glade.h:18
+msgid "_Find"
+msgstr "查找(_F)"
+
+#: ../glom/frame_glom.cc:140
 msgid "Records:"
 msgstr "记录:"
 
-#: ../glom/frame_glom.cc:140
+#: ../glom/frame_glom.cc:143
 msgid "Found:"
 msgstr "找到:"
 
@@ -635,33 +659,33 @@ msgid "This database has no tables yet."
 msgstr "此数据库中还没有表。"
 
 #. TODO: Obviously this could be possible but it would require a network protocol and some work:
-#: ../glom/frame_glom.cc:489
+#: ../glom/frame_glom.cc:498
 msgid "Developer mode not available."
 msgstr "开发者模式不可用。"
 
-#: ../glom/frame_glom.cc:490
+#: ../glom/frame_glom.cc:499
 msgid ""
 "Developer mode is not available because the file was opened over the network "
 "from a running Glom. Only the original file may be edited."
 msgstr ""
 "开发者模式不可用,因为文件未通过网络中运行的 Glom 打开。只有原文件可以编辑。"
 
-#: ../glom/frame_glom.cc:496
+#: ../glom/frame_glom.cc:505
 msgid "Developer mode not available"
 msgstr "开发者模式不可用"
 
-#: ../glom/frame_glom.cc:497
+#: ../glom/frame_glom.cc:506
 msgid ""
 "Developer mode is not available. Check that you have sufficient database "
 "access rights and that the glom file is not read-only."
 msgstr ""
 "开发者模式不可用。检查您是否有足够的数据库访问权限以及 glom 文件是否为只读。"
 
-#: ../glom/frame_glom.cc:504
+#: ../glom/frame_glom.cc:513
 msgid "Saving in new document format"
 msgstr "以新文档格式保存"
 
-#: ../glom/frame_glom.cc:505
+#: ../glom/frame_glom.cc:514
 msgid ""
 "The document was created by an earlier version of the application. Making "
 "changes to the document will mean that the document cannot be opened by some "
@@ -670,215 +694,284 @@ msgstr ""
 "该文档是早期版本的应用程序创建的。修改文档意味着它将无法使用以前版本的程序打"
 "开。"
 
-#: ../glom/frame_glom.cc:508
+#: ../glom/frame_glom.cc:517
 msgid "Continue"
 msgstr "继续"
 
-#: ../glom/frame_glom.cc:557
+#: ../glom/frame_glom.cc:553
 msgid "Export Not Allowed."
 msgstr "不允许导出。"
 
-#: ../glom/frame_glom.cc:557
+#: ../glom/frame_glom.cc:553
 msgid ""
 "You do not have permission to view the data in this table, so you may not "
 "export the data."
 msgstr "您没有查看此表中数据的权限,因此您不能导出这些数据。"
 
-#: ../glom/frame_glom.cc:588
+#: ../glom/frame_glom.cc:586
 msgid "Could Not Create File."
 msgstr "无法创建文件。"
 
-#: ../glom/frame_glom.cc:588
+#: ../glom/frame_glom.cc:586
 msgid "Glom could not create the specified file."
 msgstr "Glom 无法创建指定的文件。"
 
-#: ../glom/frame_glom.cc:739
+#: ../glom/frame_glom.cc:597
 msgid "No Table"
 msgstr "没有表"
 
-#: ../glom/frame_glom.cc:739
+#: ../glom/frame_glom.cc:597
 msgid "There is no table in to which data could be imported."
 msgstr "没有可供导入数据的表。"
 
-#: ../glom/frame_glom.cc:743
+#: ../glom/frame_glom.cc:601
 msgid "Open CSV Document"
 msgstr "打开 CSV 文档"
 
-#: ../glom/frame_glom.cc:747
+#: ../glom/frame_glom.cc:605
 msgid "CSV files"
 msgstr "CSV 文件"
 
-#: ../glom/frame_glom.cc:751
+#: ../glom/frame_glom.cc:609
 msgid "All files"
 msgstr "所有文件"
 
-#: ../glom/frame_glom.cc:826
+#: ../glom/frame_glom.cc:686
 msgid "Share on the network"
 msgstr "在网络中共享"
 
-#: ../glom/frame_glom.cc:827
+#: ../glom/frame_glom.cc:687
 msgid "This will allow other users on the network to use this database."
 msgstr "这会允许网络中的其他用户使用该数据库。"
 
-#: ../glom/frame_glom.cc:830
+#: ../glom/frame_glom.cc:690
 msgid "_Share"
 msgstr "共享(_S)"
 
 #. TODO: Warn about connected users if possible.
-#: ../glom/frame_glom.cc:925
+#: ../glom/frame_glom.cc:792
 msgid "Stop sharing on the network"
 msgstr "停止在网络中共享"
 
-#: ../glom/frame_glom.cc:926
+#: ../glom/frame_glom.cc:793
 msgid "This will prevent other users on the network from using this database."
 msgstr "这会阻止网络中的其他用户使用该数据库。"
 
-#: ../glom/frame_glom.cc:929
+#: ../glom/frame_glom.cc:796
 msgid "_Stop Sharing"
 msgstr "停止共享(_S)"
 
-#: ../glom/frame_glom.cc:977 ../glom/frame_glom.cc:2094
+#: ../glom/frame_glom.cc:845 ../glom/frame_glom.cc:2049
 msgid "Stopping Database Server"
 msgstr "正在停止数据库服务器"
 
-#. Do startup, such as starting the self-hosting database server
-#: ../glom/frame_glom.cc:980 ../glom/frame_glom.cc:1982
-#: ../glom/frame_glom.cc:2140
+#: ../glom/frame_glom.cc:848 ../glom/frame_glom.cc:1976
+#: ../glom/frame_glom.cc:2095
 msgid "Starting Database Server"
 msgstr "正在启动数据库服务器"
 
-#: ../glom/frame_glom.cc:1135
+#: ../glom/frame_glom.cc:1010
 msgid "Table Exists Already"
 msgstr "表已存在"
 
-#: ../glom/frame_glom.cc:1135
+#: ../glom/frame_glom.cc:1010
 msgid ""
 "A table with this name already exists in the database. Please choose a "
 "different table name."
 msgstr "数据库中同名的表已经存在。请另选一个表名。"
 
-#: ../glom/frame_glom.cc:1139
+#: ../glom/frame_glom.cc:1014
 msgid "Relationship Exists Already"
 msgstr "关系已存在"
 
-#: ../glom/frame_glom.cc:1139
+#: ../glom/frame_glom.cc:1014
 msgid ""
 "A relationship with this name already exists for this table. Please choose a "
 "different relationship name."
 msgstr "表中同名的关系已经存在。请另选一个关系名。"
 
-#: ../glom/frame_glom.cc:1143
+#: ../glom/frame_glom.cc:1018
 msgid "More information needed"
 msgstr "需要更多信息"
 
-#: ../glom/frame_glom.cc:1143
+#: ../glom/frame_glom.cc:1018
 msgid "You must specify a field, a table name, and a relationship name."
 msgstr "您必须指定一个字段、表名及关系名。"
 
-#: ../glom/frame_glom.cc:1197
+#: ../glom/frame_glom.cc:1071
 msgid "Related Table Created"
 msgstr "相关表已创建"
 
-#: ../glom/frame_glom.cc:1197
+#: ../glom/frame_glom.cc:1071
 msgid "The new related table has been created."
 msgstr "新相关表已创建。"
 
 #. namespace Glom
-#: ../glom/frame_glom.cc:1226 ../ui/operator/box_navigation_tables.glade.h:1
+#: ../glom/frame_glom.cc:1101
+#: ../data/ui/operator/box_navigation_tables.glade.h:1
 msgid "Edit Tables"
 msgstr "编辑表"
 
-#: ../glom/frame_glom.cc:1299
-#: ../glom/mode_data/datawidget/dialog_choose_id.cc:108
-msgid "You have not entered any quick find criteria."
-msgstr ""
+#: ../glom/frame_glom.cc:1197
+msgid ""
+"You have not entered any find criteria. Try entering information in the "
+"fields."
+msgstr "您尚未输入任何查找条件。尝试在字段中输入信息。"
 
-#: ../glom/frame_glom.cc:1300
-msgid "No find criteria"
-msgstr ""
+#: ../glom/frame_glom.cc:1199
+#: ../glom/mode_data/datawidget/dialog_choose_id.cc:105
+msgid "No Find Criteria"
+msgstr "无查找条件"
 
-#: ../glom/frame_glom.cc:1655 ../ui/developer/box_reports.glade.h:1
+#: ../glom/frame_glom.cc:1575 ../glom/onlineglom_strings.cc:33
+#: ../data/ui/developer/box_reports.glade.h:1
 msgid "Reports"
 msgstr "报表"
 
-#: ../glom/frame_glom.cc:1686 ../ui/developer/box_print_layouts.glade.h:1
+#: ../glom/frame_glom.cc:1619 ../data/ui/developer/box_print_layouts.glade.h:1
 msgid "Print Layouts"
 msgstr "打印布局"
 
-#: ../glom/frame_glom.cc:1802
+#: ../glom/frame_glom.cc:1775
 msgid "Could Not Create Directory"
 msgstr "无法创建目录"
 
-#: ../glom/frame_glom.cc:1803
+#: ../glom/frame_glom.cc:1776
 msgid ""
 "There was an error when attempting to create the directory for the new "
 "database files."
 msgstr "在尝试为新数据库文件创建目录时出现了一个错误。"
 
-#: ../glom/frame_glom.cc:1807
+#: ../glom/frame_glom.cc:1780
 msgid "Could Not Start Database Server"
 msgstr "无法启动数据库服务器"
 
-#: ../glom/frame_glom.cc:1808
+#: ../glom/frame_glom.cc:1781
 msgid "There was an error when attempting to start the database server."
 msgstr "在尝试启动数据库服务器时出现了一个错误。"
 
-#: ../glom/frame_glom.cc:1913
+#: ../glom/frame_glom.cc:1906
 msgid "Initializing Database Data"
 msgstr "正在初始化数据库数据"
 
 #. Show 0 instead of "all" when all of no records are found, to avoid confusion.
-#: ../glom/frame_glom.cc:2439
+#: ../glom/frame_glom.cc:2430
 msgid "All"
 msgstr "所有"
 
-#: ../glom/utils_ui.cc:141
-msgid "No help file available"
-msgstr "没有帮助文件"
-
-#: ../glom/utils_ui.cc:159
+#: ../glom/utils_ui.cc:164
 msgid "Could not display help: %1"
 msgstr "无法显示帮助:%1"
 
-#: ../glom/utils_ui.cc:475
+#: ../glom/utils_ui.cc:484
 msgid "Your find criteria did not match any records in the table."
-msgstr ""
+msgstr "您的查找条件与表中的任何记录都不匹配。"
 
-#: ../glom/utils_ui.cc:477
+#: ../glom/utils_ui.cc:486
 msgid "No Records Found"
 msgstr "未找到记录"
 
-#: ../glom/utils_ui.cc:482
+#: ../glom/utils_ui.cc:491
 msgid "New Find"
 msgstr "新的查找"
 
-#: ../glom/utils_ui.cc:493
+#: ../glom/utils_ui.cc:502
 msgid "Report Finished"
 msgstr "报表已完成"
 
-#: ../glom/utils_ui.cc:493
+#: ../glom/utils_ui.cc:502
 msgid "The report will now be opened in your web browser."
 msgstr "现在报表将在您的网络浏览器中打开。"
 
-#: ../glom/bakery/app_withdoc_gtk.cc:284
-#: ../ui/developer/window_field_definition_edit.glade.h:8
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../glom/utils_ui.cc:543
+msgid "Script Uses PyGTK 2"
+msgstr "脚本使用 PyGTK 2"
 
-#: ../glom/bakery/app_withdoc_gtk.cc:376
-msgid "Open Document"
-msgstr "打开文档"
+#: ../glom/utils_ui.cc:544
+msgid ""
+"Glom cannot run this script because it uses pygtk 2, but Glom uses GTK+ 3, "
+"and attempting to use pygtk 2 would cause Glom to crash."
+msgstr ""
+
+#. These strings are not actually used by Glom.
+#. I am putting them here so that GNOME's translators can translate them
+#. without dealing with the awkward (not gettext) system here:
+#. http://www.murrayc.com/blog/permalink/2012/01/27/online-glom-more-translation/
+#. murrayc
+#: ../glom/onlineglom_strings.cc:29
+msgid "Search"
+msgstr "搜索"
+
+#: ../glom/onlineglom_strings.cc:30
+msgid "Back to List"
+msgstr "返回列表"
+
+#. Translators: This is a noun. It is a notebook tab title.
+#. Details column:
+#: ../glom/onlineglom_strings.cc:31 ../glom/libglom/document/document.cc:1407
+#: ../glom/mode_data/notebook_data.cc:43
+#: ../glom/mode_design/report_layout/dialog_layout_report.cc:213
+#: ../glom/mode_find/notebook_find.cc:38
+msgid "Details"
+msgstr "细节"
+
+#: ../glom/onlineglom_strings.cc:34
+msgid "Generating the report..."
+msgstr "正在生成报表..."
+
+#: ../glom/onlineglom_strings.cc:35
+msgid "Login"
+msgstr "登录"
+
+#: ../glom/onlineglom_strings.cc:36
+msgid "Enter the username and password."
+msgstr "输入用户名和密码。"
+
+#: ../glom/onlineglom_strings.cc:37
+msgid "Username"
+msgstr "用户名"
+
+#: ../glom/onlineglom_strings.cc:38
+#: ../data/ui/operator/dialog_connection.glade.h:7
+msgid "Password"
+msgstr "密码"
+
+#: ../glom/onlineglom_strings.cc:39
+msgid "Log Out"
+msgstr "注销"
+
+#: ../glom/onlineglom_strings.cc:41
+msgid "The username or password are not correct."
+msgstr "用户名或密码不正确。"
+
+#: ../glom/onlineglom_strings.cc:42
+msgid ""
+"Login seems to be necessary, but will not be attempted. This site is not "
+"being served via HTTPS, which is required for secure login. Please contact "
+"your system administrator."
+msgstr ""
 
-#: ../glom/bakery/app_withdoc.cc:237 ../glom/bakery/app_withdoc.cc:288
+#. / Translators: This is the title of a button used to register a new user.
+#: ../glom/onlineglom_strings.cc:45
+msgid "Register"
+msgstr "注册"
+
+#. / Translators: This is the title of a button used to reset a user's password.
+#: ../glom/onlineglom_strings.cc:48
+msgid "Forgot Password"
+msgstr "忘记密码"
+
+#: ../glom/bakery/appwindow_withdoc.cc:226
+#: ../glom/bakery/appwindow_withdoc.cc:270
 msgid ""
 "There was an error while saving the file. Your changes have not been saved."
 msgstr "在保存文件时出现了一个错误。您的更改没有保存。"
 
-#: ../glom/bakery/app_withdoc.cc:493
+#: ../glom/bakery/appwindow_withdoc.cc:469
 msgid "Open Failed."
 msgstr "打开失败。"
 
-#: ../glom/bakery/app_withdoc.cc:493
+#: ../glom/bakery/appwindow_withdoc.cc:469
 msgid "The document could not be opened."
 msgstr "无法打开该文档。"
 
@@ -886,7 +979,9 @@ msgstr "无法打开该文档。"
 msgid "This document has unsaved changes. Would you like to save the document?"
 msgstr "该文档有未保存的更改。您想保存此文档吗?"
 
-#: ../glom/bakery/dialog_offersave.cc:35
+#. TODO: Can we use filename_display_basename() with a URI?
+#. No, almost certainly not. murrayc.
+#: ../glom/bakery/dialog_offersave.cc:38
 msgid ""
 "Document:\n"
 "%1"
@@ -894,11 +989,11 @@ msgstr ""
 "文档:\n"
 "%1"
 
-#: ../glom/bakery/dialog_offersave.cc:47
+#: ../glom/bakery/dialog_offersave.cc:50
 msgid "Close without Saving"
 msgstr "不保存关闭"
 
-#: ../glom/bakery/dialog_offersave.cc:53
+#: ../glom/bakery/dialog_offersave.cc:56
 msgid "Discard"
 msgstr "丢弃"
 
@@ -913,7 +1008,7 @@ msgstr "自动检测"
 #. Get the ISO (not current locale) text representation:
 #. ignored
 #. iso_format
-#: ../glom/import_csv/dialog_import_csv.cc:154
+#: ../glom/import_csv/dialog_import_csv.cc:152
 msgid ""
 "Note that the source file should contain numbers and dates in international "
 "ISO format. For instance, 22nd November 2008 should be %1."
@@ -921,20 +1016,20 @@ msgstr ""
 "注意源文件中包含的数字和日期应为国际通用的 ISO 格式。如,2008年10月22日应表示"
 "为 %1。"
 
-#: ../glom/import_csv/dialog_import_csv.cc:183
+#: ../glom/import_csv/dialog_import_csv.cc:181
 msgid "No Document Available"
 msgstr "没有可用的文档"
 
-#: ../glom/import_csv/dialog_import_csv.cc:183
+#: ../glom/import_csv/dialog_import_csv.cc:181
 msgid "You need to open a document to import the data into a table."
 msgstr "要将数据导入表中,您需要打开一个文档。"
 
-#: ../glom/import_csv/dialog_import_csv.cc:194
+#: ../glom/import_csv/dialog_import_csv.cc:192
 msgid "Import From CSV File"
 msgstr "从 CSV 文件导入"
 
-#: ../glom/import_csv/dialog_import_csv.cc:199
-#: ../glom/import_csv/dialog_import_csv.cc:576
+#: ../glom/import_csv/dialog_import_csv.cc:197
+#: ../glom/import_csv/dialog_import_csv.cc:577
 msgid "<None>"
 msgstr "<无>"
 
@@ -942,15 +1037,15 @@ msgstr "<无>"
 msgid "Error Importing CSV File"
 msgstr "导入 CSV 文件出错"
 
-#: ../glom/import_csv/dialog_import_csv.cc:428
+#: ../glom/import_csv/dialog_import_csv.cc:429
 msgid "Encoding detected as: %1"
 msgstr "检测到的编码为:%1"
 
-#: ../glom/import_csv/dialog_import_csv.cc:467
+#: ../glom/import_csv/dialog_import_csv.cc:468
 msgid "Encoding detection failed. Please manually choose one from the box."
 msgstr "编码检测失败。请从下拉框中手工选择一种。"
 
-#: ../glom/import_csv/dialog_import_csv.cc:471
+#: ../glom/import_csv/dialog_import_csv.cc:472
 msgid ""
 "The file contains data not in the specified encoding. Please choose another "
 "one, or try \"Auto Detect\"."
@@ -958,46 +1053,46 @@ msgstr "文件中包含不是指定编码的数据。请另选一种编码,或
 
 #. Translators: This is the name of a UI element (a layout part name).
 #. This is a straight line, not a database row.
-#: ../glom/import_csv/dialog_import_csv.cc:513
-#: ../glom/libglom/data_structure/layout/layoutitem_line.cc:91
+#: ../glom/import_csv/dialog_import_csv.cc:514
+#: ../glom/libglom/data_structure/layout/layoutitem_line.cc:61
 msgid "Line"
 msgstr "直线"
 
-#: ../glom/import_csv/dialog_import_csv.cc:556
+#: ../glom/import_csv/dialog_import_csv.cc:557
 msgid "Target Field"
 msgstr "目标字段"
 
-#: ../glom/import_csv/dialog_import_csv.cc:601
+#: ../glom/import_csv/dialog_import_csv.cc:602
 msgid "<Import Failure>"
 msgstr "<导入失败>"
 
-#: ../glom/import_csv/dialog_import_csv.cc:611
+#: ../glom/import_csv/dialog_import_csv.cc:612
 msgid "<Picture>"
 msgstr "<图片>"
 
-#: ../glom/import_csv/dialog_import_csv.cc:710
+#: ../glom/import_csv/dialog_import_csv.cc:712
 msgid ""
 "One column needs to be assigned the table's primary key (<b>%1</b>) as "
 "target field before importing"
 msgstr "在导入前,需要将某列指定为表的主键(<b>%1</b>)。"
 
-#: ../glom/import_csv/dialog_import_csv.cc:738
+#: ../glom/import_csv/dialog_import_csv.cc:740
 msgid "Could Not Open file"
 msgstr "无法打开文件"
 
-#: ../glom/import_csv/dialog_import_csv.cc:739
+#: ../glom/import_csv/dialog_import_csv.cc:741
 msgid "The file at \"%1\" could not be opened: %2"
 msgstr "位于“%1”的文件无法打开:%2"
 
-#: ../glom/import_csv/dialog_import_csv.cc:745
+#: ../glom/import_csv/dialog_import_csv.cc:747
 msgid "Import From CSV File: %1"
 msgstr "从 CSV 文件导入:%1"
 
-#: ../glom/import_csv/dialog_import_csv_progress.cc:85
+#: ../glom/import_csv/dialog_import_csv_progress.cc:86
 msgid "Parsing CSV file %1"
 msgstr "正在解析 CSV 文件 %1"
 
-#: ../glom/import_csv/dialog_import_csv_progress.cc:174
+#: ../glom/import_csv/dialog_import_csv_progress.cc:176
 msgid "Import complete\n"
 msgstr "导入完成\n"
 
@@ -1015,7 +1110,7 @@ msgid ""
 msgstr ""
 "警告:导入第 %1 行:%2 字段的值“%3” 无法转换为字段的类型。值将不会导入。\n"
 
-#: ../glom/import_csv/dialog_import_csv_progress.cc:237
+#: ../glom/import_csv/dialog_import_csv_progress.cc:238
 msgid ""
 "Error importing row %1: Cannot import the row because the primary key is "
 "empty.\n"
@@ -1023,131 +1118,130 @@ msgstr "导入第 %1 行出错:无法导入此行,因为主键为空。\n"
 
 #. TODO: Can we get this from anywhere else, such as iso-codes? murrayc
 #. TODO: Make this generally more efficient.
-#: ../glom/import_csv/file_encodings.cc:93
-#: ../glom/import_csv/file_encodings.cc:94
-#: ../glom/import_csv/file_encodings.cc:95
-#: ../glom/import_csv/file_encodings.cc:96
-#: ../glom/import_csv/file_encodings.cc:97
-#: ../glom/import_csv/file_encodings.cc:98
-#: ../glom/import_csv/file_encodings.cc:99
-#: ../glom/import_csv/file_encodings.cc:100
+#: ../glom/import_csv/file_encodings.cc:68
+#: ../glom/import_csv/file_encodings.cc:69
+#: ../glom/import_csv/file_encodings.cc:70
+#: ../glom/import_csv/file_encodings.cc:71
+#: ../glom/import_csv/file_encodings.cc:72
+#: ../glom/import_csv/file_encodings.cc:73
+#: ../glom/import_csv/file_encodings.cc:74
+#: ../glom/import_csv/file_encodings.cc:75
 msgid "Unicode"
 msgstr "Unicode"
 
 #. This just adds a separator in the combo box
-#: ../glom/import_csv/file_encodings.cc:102
-#: ../glom/import_csv/file_encodings.cc:115
-#: ../glom/import_csv/file_encodings.cc:120
+#: ../glom/import_csv/file_encodings.cc:77
+#: ../glom/import_csv/file_encodings.cc:90
+#: ../glom/import_csv/file_encodings.cc:95
 msgid "Western"
 msgstr "西方"
 
 #. This just adds a separator in the combo box
-#: ../glom/import_csv/file_encodings.cc:103
-#: ../glom/import_csv/file_encodings.cc:118
+#: ../glom/import_csv/file_encodings.cc:78
+#: ../glom/import_csv/file_encodings.cc:93
 msgid "Central European"
 msgstr "中欧"
 
-#: ../glom/import_csv/file_encodings.cc:104
+#: ../glom/import_csv/file_encodings.cc:79
 msgid "South European"
 msgstr "南欧"
 
-#: ../glom/import_csv/file_encodings.cc:105
-#: ../glom/import_csv/file_encodings.cc:113
-#: ../glom/import_csv/file_encodings.cc:125
+#: ../glom/import_csv/file_encodings.cc:80
+#: ../glom/import_csv/file_encodings.cc:88
+#: ../glom/import_csv/file_encodings.cc:100
 msgid "Baltic"
 msgstr "波罗的海"
 
-#: ../glom/import_csv/file_encodings.cc:106
-#: ../glom/import_csv/file_encodings.cc:119
+#: ../glom/import_csv/file_encodings.cc:81
+#: ../glom/import_csv/file_encodings.cc:94
 msgid "Cyrillic"
 msgstr "西里尔"
 
-#: ../glom/import_csv/file_encodings.cc:107
-#: ../glom/import_csv/file_encodings.cc:124
+#: ../glom/import_csv/file_encodings.cc:82
+#: ../glom/import_csv/file_encodings.cc:99
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: ../glom/import_csv/file_encodings.cc:108
-#: ../glom/import_csv/file_encodings.cc:121
+#: ../glom/import_csv/file_encodings.cc:83
+#: ../glom/import_csv/file_encodings.cc:96
 msgid "Greek"
 msgstr "德语"
 
-#: ../glom/import_csv/file_encodings.cc:109
+#: ../glom/import_csv/file_encodings.cc:84
 msgid "Hebrew Visual"
 msgstr ""
 
-#: ../glom/import_csv/file_encodings.cc:110
-#: ../glom/import_csv/file_encodings.cc:123
+#: ../glom/import_csv/file_encodings.cc:85
+#: ../glom/import_csv/file_encodings.cc:98
 msgid "Hebrew"
 msgstr "希伯来语"
 
-#: ../glom/import_csv/file_encodings.cc:111
-#: ../glom/import_csv/file_encodings.cc:122
+#: ../glom/import_csv/file_encodings.cc:86
+#: ../glom/import_csv/file_encodings.cc:97
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: ../glom/import_csv/file_encodings.cc:112
+#: ../glom/import_csv/file_encodings.cc:87
 msgid "Nordic"
 msgstr ""
 
-#: ../glom/import_csv/file_encodings.cc:114
+#: ../glom/import_csv/file_encodings.cc:89
 msgid "Celtic"
-msgstr ""
+msgstr "凯尔特语"
 
-#: ../glom/import_csv/file_encodings.cc:116
+#: ../glom/import_csv/file_encodings.cc:91
 msgid "Romanian"
-msgstr ""
+msgstr "罗马尼亚语"
 
-#: ../glom/import_csv/file_encodings.cc:126
+#: ../glom/import_csv/file_encodings.cc:101
 msgid "Vietnamese"
-msgstr ""
+msgstr "越南语"
 
 #. Translators: This means an unknown or unnacceptable value type in a database.
-#: ../glom/libglom/data_structure/field.cc:687
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:151
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:159
+#: ../glom/libglom/data_structure/field.cc:627
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:133
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:141
 msgid "Invalid"
 msgstr "无效"
 
 #. Translators: This means a numeric value type in a database.
-#: ../glom/libglom/data_structure/field.cc:690
+#: ../glom/libglom/data_structure/field.cc:630
 msgid "Number"
 msgstr "数字"
 
 #. Translators: This means a text/string value type in a database.
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/field.cc:693
-#: ../glom/libglom/data_structure/layout/layoutitem_text.cc:73
-#: ../glom/libglom/data_structure/translatable_item.cc:317
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1158
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:36
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:761
+#: ../glom/libglom/data_structure/field.cc:633
+#: ../glom/libglom/data_structure/layout/layoutitem_text.cc:70
+#: ../glom/libglom/data_structure/translatable_item.cc:228
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1156
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:35
 msgid "Text"
 msgstr "文字"
 
 #. Translators: This means a time value type in a database.
-#: ../glom/libglom/data_structure/field.cc:696
+#: ../glom/libglom/data_structure/field.cc:636
 msgid "Time"
 msgstr "时间"
 
 #. Translators: This means a time value type in a database.
-#: ../glom/libglom/data_structure/field.cc:699
+#: ../glom/libglom/data_structure/field.cc:639
 msgid "Date"
 msgstr "日期"
 
 #. Translators: This means a true/false value type in a database.
-#: ../glom/libglom/data_structure/field.cc:702
+#: ../glom/libglom/data_structure/field.cc:642
 msgid "Boolean"
 msgstr "布尔型"
 
 #. Translators: This means a picture value type in a database.
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/field.cc:705
-#: ../glom/libglom/data_structure/layout/layoutitem_image.cc:70
-#: ../glom/libglom/data_structure/translatable_item.cc:319
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1165
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:38
-#: ../glom/utility_widgets/layouttoolbar.cc:47
+#: ../glom/libglom/data_structure/field.cc:645
+#: ../glom/libglom/data_structure/layout/layoutitem_image.cc:50
+#: ../glom/libglom/data_structure/translatable_item.cc:222
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1163
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:37
+#: ../glom/utility_widgets/layouttoolbar.cc:46
 msgid "Image"
 msgstr "图像"
 
@@ -1158,13 +1252,13 @@ msgstr "图像"
 #. * and default to %d/%m/%Y" if it detects a problem, but that might not be
 #. * correct for your locale.
 #. * Thanks.
-#: ../glom/libglom/data_structure/glomconversions.cc:99
+#: ../glom/libglom/data_structure/glomconversions.cc:143
 #, no-c-format
 msgid "%x"
 msgstr "%Y-%m-%d"
 
 #. Note to translators: If you see this error in the terminal at startup then you need to translate the %x 
elsewhere.
-#: ../glom/libglom/data_structure/glomconversions.cc:147
+#: ../glom/libglom/data_structure/glomconversions.cc:207
 msgid ""
 "ERROR: sanity_check_date_parsing(): Sanity check failed: Glom could not "
 "parse a date's text representation that it generated itself, in this locale."
@@ -1173,7 +1267,7 @@ msgstr ""
 "示,于是自己针对此区域生成了一个日期文本。"
 
 #. Note to translators: If you see this error in the terminal at startup then you need to translate the %x 
elsewhere.
-#: ../glom/libglom/data_structure/glomconversions.cc:181
+#: ../glom/libglom/data_structure/glomconversions.cc:243
 msgid ""
 "ERROR: sanity_check_date_text_representation_uses_4_digit_year(): Sanity "
 "check failed: Glom does not seem to use 4 digits to display years in a "
@@ -1187,329 +1281,308 @@ msgstr ""
 "bug - 参见 http://www.glom.org";
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/layoutgroup.cc:514
-#: ../glom/utility_widgets/layouttoolbar.cc:35
-#: ../glom/utility_widgets/layouttoolbar.cc:45
-#: ../glom/utility_widgets/notebooklabelglom.cc:76
+#: ../glom/libglom/data_structure/layout/layoutgroup.cc:398
+#: ../glom/utility_widgets/layouttoolbar.cc:34
+#: ../glom/utility_widgets/layouttoolbar.cc:44
+#: ../glom/utility_widgets/notebooklabelglom.cc:71
 msgid "Group"
 msgstr "组"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/layoutitem_button.cc:68
-#: ../glom/libglom/data_structure/translatable_item.cc:315
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1151
-#: ../glom/utility_widgets/layouttoolbar.cc:43
+#: ../glom/libglom/data_structure/layout/layoutitem_button.cc:49
+#: ../glom/libglom/data_structure/translatable_item.cc:218
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1149
+#: ../glom/utility_widgets/layouttoolbar.cc:42
 msgid "Button"
 msgstr "按钮"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/layoutitem_calendarportal.cc:58
+#: ../glom/libglom/data_structure/layout/layoutitem_calendarportal.cc:40
 msgid "Calendar Portal"
 msgstr "日历入口"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/layoutitem_field.cc:219
-#: ../glom/libglom/data_structure/translatable_item.cc:297
-#: ../glom/mode_design/dialog_database_preferences.cc:62
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:757
-#: ../ui/developer/window_field_definition_edit.glade.h:2
+#: ../glom/libglom/data_structure/layout/layoutitem_field.cc:189
+#: ../glom/libglom/data_structure/translatable_item.cc:204
+#: ../glom/mode_design/dialog_database_preferences.cc:63
+#: ../data/ui/developer/window_field_definition_edit.glade.h:8
 msgid "Field"
 msgstr "字段"
 
 #. Translators: This is the name of a UI element (a layout part name).
 #. "Notebook" means a GtkNotebook-type widget.
-#: ../glom/libglom/data_structure/layout/layoutitem_notebook.cc:57
-#: ../glom/utility_widgets/layouttoolbar.cc:37
+#: ../glom/libglom/data_structure/layout/layoutitem_notebook.cc:41
+#: ../glom/utility_widgets/layouttoolbar.cc:36
 msgid "Notebook"
 msgstr "笔记本"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/layoutitem_placeholder.cc:60
+#: ../glom/libglom/data_structure/layout/layoutitem_placeholder.cc:50
 msgid "Placeholder"
 msgstr "占位符"
 
-#. TODO: "Portal" probably shouldn't appear in the UI.
-#. We should use "Related Records instead.
-#. Translators: This is the name of a UI element (a layout part name).
-#. It means a list of related records.
-#: ../glom/libglom/data_structure/layout/layoutitem_portal.cc:88
-msgid "Portal"
-msgstr "入口"
-
 #. TODO: This prevents "" as a real title.
 #. parent table - not relevant
 #. TODO: This prevents "" as a real title.
 #. Note to translators: This text is shown instead of a table title, when the table has not yet been chosen.
-#: ../glom/libglom/data_structure/layout/layoutitem_portal.cc:424
-#: ../glom/libglom/data_structure/layout/layoutitem_portal.cc:433
-#: ../glom/mode_data/box_data_portal.cc:116
-#: ../glom/mode_data/box_data_portal.cc:128
+#: ../glom/libglom/data_structure/layout/layoutitem_portal.cc:375
+#: ../glom/libglom/data_structure/layout/layoutitem_portal.cc:384
+#: ../glom/mode_data/box_data_portal.cc:142
+#: ../glom/mode_data/box_data_portal.cc:155
 msgid "Undefined Table"
 msgstr "未定义的表"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:79
-#: ../ui/developer/dialog_field_summary.glade.h:2
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:61
+#: ../data/ui/developer/dialog_field_summary.glade.h:1
 msgid "Field Summary"
 msgstr "字段汇总"
 
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:134
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:116
 msgid "No summary chosen"
 msgstr "没有选择汇总"
 
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:153
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:135
 msgid "Sum"
 msgstr "和"
 
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:155
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:137
 msgid "Average"
 msgstr "平均值"
 
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:157
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_fieldsummary.cc:139
 msgid "Count"
 msgstr "计数"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc:56
-#: ../ui/developer/window_report_layout.glade.h:4
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_footer.cc:40
+#: ../data/ui/developer/window_report_layout.glade.h:13
 msgid "Footer"
 msgstr "页脚"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc:103
-#: ../ui/developer/dialog_group_by.glade.h:5
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_groupby.cc:79
+#: ../data/ui/developer/dialog_group_by.glade.h:1
 msgid "Group By"
 msgstr "分组依据"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc:56
-#: ../ui/developer/window_report_layout.glade.h:5
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_header.cc:39
+#: ../data/ui/developer/window_report_layout.glade.h:10
 msgid "Header"
 msgstr "页眉"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc:62
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_summary.cc:45
 msgid "Summary"
 msgstr "汇总"
 
 #. Translators: This is the name of a UI element (a layout part name).
-#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc:56
+#: ../glom/libglom/data_structure/layout/report_parts/layoutitem_verticalgroup.cc:40
 msgid "Vertical Group"
 msgstr "竖直组"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:299
+#: ../glom/libglom/data_structure/translatable_item.cc:206
 msgid "Custom Title"
 msgstr "自定义标题"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:301
+#: ../glom/libglom/data_structure/translatable_item.cc:208
 msgid "Relationship"
 msgstr "关系"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:303
-msgid "Layout Item"
-msgstr "布局项"
-
-#: ../glom/libglom/data_structure/translatable_item.cc:305
+#: ../glom/libglom/data_structure/translatable_item.cc:210
 msgid "Print Layout"
 msgstr "打印布局"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:307
+#: ../glom/libglom/data_structure/translatable_item.cc:212
 msgid "Report"
 msgstr "报表"
 
 #. Tables:
-#: ../glom/libglom/data_structure/translatable_item.cc:309
-#: ../glom/mode_design/box_db_table_relationships.cc:52
-#: ../glom/mode_design/dialog_database_preferences.cc:61
-#: ../glom/mode_design/users/dialog_groups_list.cc:72
-#: ../glom/navigation/box_tables.cc:132
+#: ../glom/libglom/data_structure/translatable_item.cc:214
+#: ../glom/mode_design/box_db_table_relationships.cc:55
+#: ../glom/mode_design/dialog_database_preferences.cc:62
+#: ../glom/mode_design/users/dialog_groups_list.cc:73
+#: ../glom/navigation/box_tables.cc:127
 msgid "Table"
 msgstr "表"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:311
-msgid "Layout Group"
-msgstr "布局组"
-
-#: ../glom/libglom/data_structure/translatable_item.cc:313
-msgid "Field Title"
-msgstr "字段标题"
+#: ../glom/libglom/data_structure/translatable_item.cc:216
+msgid "Layout Item"
+msgstr "布局项"
+
+#: ../glom/libglom/data_structure/translatable_item.cc:220
+#, fuzzy
+#| msgid "Text Title"
+msgid "Text Item"
+msgstr "文本标题"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:321
+#: ../glom/libglom/data_structure/translatable_item.cc:224
 msgid "Field Choice"
 msgstr "字段选择"
 
-#: ../glom/libglom/data_structure/translatable_item.cc:323
-#: ../glom/mode_design/translation/window_translations.cc:216
+#: ../glom/libglom/data_structure/translatable_item.cc:226
+#, fuzzy
+#| msgid "Database Field"
+msgid "Database Title"
+msgstr "数据库字段"
+
+#: ../glom/libglom/data_structure/translatable_item.cc:230
+#: ../glom/mode_design/translation/window_translations.cc:233
 msgid "Unknown"
 msgstr "未知"
 
-#: ../glom/libglom/document/document.cc:507
-#: ../glom/libglom/document/document.cc:525
+#: ../glom/libglom/document/document.cc:503
+#: ../glom/libglom/document/document.cc:521
 msgid "System Preferences"
 msgstr "系统首选项"
 
-#: ../glom/libglom/document/document.cc:538
+#: ../glom/libglom/document/document.cc:534
 msgid "System Name"
 msgstr "系统名称"
 
-#: ../glom/libglom/document/document.cc:544
+#: ../glom/libglom/document/document.cc:540
 msgid "Organisation Name"
 msgstr "组织名称"
 
-#: ../glom/libglom/document/document.cc:550
+#: ../glom/libglom/document/document.cc:546
 msgid "Organisation Logo"
 msgstr "组织徽标"
 
-#: ../glom/libglom/document/document.cc:556
+#: ../glom/libglom/document/document.cc:552
 msgid "Street"
 msgstr "街道"
 
-#: ../glom/libglom/document/document.cc:562
+#: ../glom/libglom/document/document.cc:558
 msgid "Street (line 2)"
 msgstr "街道 (第 2 行)"
 
-#: ../glom/libglom/document/document.cc:568
+#: ../glom/libglom/document/document.cc:564
 msgid "City"
 msgstr "城市"
 
-#: ../glom/libglom/document/document.cc:574
+#: ../glom/libglom/document/document.cc:570
 msgid "State"
 msgstr "州"
 
-#: ../glom/libglom/document/document.cc:580
+#: ../glom/libglom/document/document.cc:576
 msgid "Country"
 msgstr "国家"
 
-#: ../glom/libglom/document/document.cc:586
+#: ../glom/libglom/document/document.cc:582
 msgid "Zip Code"
 msgstr "邮编"
 
-#: ../glom/libglom/document/bakery/document.cc:413
+#: ../glom/libglom/document/document.cc:1401
+msgid "Overview"
+msgstr ""
+
+#: ../glom/libglom/document/bakery/document.cc:419
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../glom/libglom/gst-package.c:56
-msgid "Could not install package"
-msgstr "无法安装软件包"
-
-#: ../glom/libglom/gst-package.c:74
-msgid "The necessary applications to install the package could not be found."
-msgstr "找不到安装此软件包所需的应用程序。"
-
 #. Show only debug output
-#: ../glom/libglom/translations_po.cc:69
+#: ../glom/libglom/translations_po.cc:70
 msgid "Gettext-Warning: "
 msgstr "Gettext 警告:"
 
-#: ../glom/libglom/db_utils.cc:1169
-#: ../glom/mode_design/users/dialog_groups_list.cc:69
+#: ../glom/libglom/db_utils.cc:526
+#, fuzzy
+#| msgid "Primary key auto increments"
+msgid "System: Auto Increments"
+msgstr "主键自动增加"
+
+#: ../glom/libglom/db_utils.cc:1181
+#: ../glom/mode_design/users/dialog_groups_list.cc:70
 msgid "Description"
 msgstr "描述"
 
-#: ../glom/libglom/db_utils.cc:1176
+#: ../glom/libglom/db_utils.cc:1188
 msgid "Comments"
 msgstr "评论"
 
 #. Translators: This is a noun. It is the title of a report.
 #. Add Pages:
 #. Translators: This is a noun. It is a notebook tab title.
-#: ../glom/libglom/report_builder.cc:634 ../glom/mode_data/notebook_data.cc:62
-#: ../glom/mode_find/notebook_find.cc:31
+#: ../glom/libglom/report_builder.cc:744 ../glom/mode_data/notebook_data.cc:40
+#: ../glom/mode_find/notebook_find.cc:33
 msgid "List"
 msgstr "列表"
 
-#: ../glom/glom_create_from_example.cc:63 ../glom/glom_export_po.cc:51
-#: ../glom/glom_export_po_all.cc:49 ../glom/glom_import_po_all.cc:50
-#: ../glom/glom_test_connection.cc:55 ../glom/main.cc:197
+#: ../glom/glom_create_from_example.cc:74 ../glom/glom_export_po.cc:51
+#: ../glom/glom_export_po_all.cc:49 ../glom/glom_import_po_all.cc:51
+#: ../glom/glom_test_connection.cc:60
 msgid "Glom options"
 msgstr "Glom 选项"
 
-#: ../glom/glom_create_from_example.cc:63 ../glom/glom_export_po.cc:51
-#: ../glom/glom_export_po_all.cc:49 ../glom/glom_import_po_all.cc:50
-#: ../glom/glom_test_connection.cc:55
+#: ../glom/glom_create_from_example.cc:74 ../glom/glom_export_po.cc:51
+#: ../glom/glom_export_po_all.cc:49 ../glom/glom_import_po_all.cc:51
+#: ../glom/glom_test_connection.cc:60
 msgid "Command-line options"
 msgstr "命令行选项"
 
-#: ../glom/glom_create_from_example.cc:70
+#: ../glom/glom_create_from_example.cc:85
+#, fuzzy
 msgid "The example .glom file to open."
-msgstr ""
+msgstr "要打开的示例 .glom 文件。"
 
-#: ../glom/glom_create_from_example.cc:75
+#: ../glom/glom_create_from_example.cc:90
 msgid ""
 "The directory in which to save the created .glom file, or sub-directory if "
 "necessary, such as /home/someuser/ ."
 msgstr ""
 
-#: ../glom/glom_create_from_example.cc:80
+#: ../glom/glom_create_from_example.cc:95
 msgid "The name for the created .glom file, such as something.glom ."
-msgstr ""
+msgstr "创建的 .glom 文件的名称,例如 something.glom。"
 
-#: ../glom/glom_create_from_example.cc:85 ../glom/glom_export_po.cc:72
-#: ../glom/glom_export_po_all.cc:60 ../glom/glom_import_po_all.cc:61
-#: ../glom/glom_test_connection.cc:63 ../glom/main.cc:212
+#: ../glom/glom_create_from_example.cc:100 ../glom/glom_export_po.cc:72
+#: ../glom/glom_export_po_all.cc:60 ../glom/glom_import_po_all.cc:62
+#: ../glom/glom_test_connection.cc:72 ../glom/main_local_options.cc:47
 msgid "The version of this application."
 msgstr "此应用程序的版本。"
 
-#: ../glom/glom_create_from_example.cc:91
+#: ../glom/glom_create_from_example.cc:106
 msgid ""
 "The hostname of the PostgreSQL server, such as localhost. If this is not "
 "specified then a self-hosted database will be created."
 msgstr ""
 
-#: ../glom/glom_create_from_example.cc:96 ../glom/glom_test_connection.cc:73
+#: ../glom/glom_create_from_example.cc:111 ../glom/glom_test_connection.cc:82
 msgid "The port of the PostgreSQL server, such as 5434."
-msgstr ""
+msgstr "PostgreSQL 服务器的端口,如 5434。"
 
-#: ../glom/glom_create_from_example.cc:101 ../glom/glom_test_connection.cc:78
+#: ../glom/glom_create_from_example.cc:116 ../glom/glom_test_connection.cc:87
 msgid "The username for the PostgreSQL server."
-msgstr ""
-
-#: ../glom/glom_create_from_example.cc:238 ../glom/glom_export_po.cc:112
-#: ../glom/glom_export_po_all.cc:100 ../glom/glom_import_po_all.cc:101
-#: ../glom/glom_test_connection.cc:131 ../glom/main.cc:486
-msgid "Error while parsing command-line options: "
-msgstr "解析命令行选项时出错:"
-
-#. TODO: How can we just print them out?
-#: ../glom/glom_create_from_example.cc:239 ../glom/glom_export_po.cc:113
-#: ../glom/glom_export_po_all.cc:101 ../glom/glom_import_po_all.cc:102
-#: ../glom/glom_test_connection.cc:91 ../glom/main.cc:487
-msgid "Use --help to see a list of available command-line options."
-msgstr "使用 --help 查看可用命令行选项的清单。"
-
-#: ../glom/glom_create_from_example.cc:273 ../glom/glom_export_po.cc:162
-#: ../glom/main.cc:531
-msgid "Glom: The file does not exist."
-msgstr "Glom:该文件不存在。"
+msgstr "PostgreSQL 服务器的用户名。"
 
-#: ../glom/glom_create_from_example.cc:283 ../glom/glom_export_po.cc:172
-#: ../glom/main.cc:541
-msgid "Glom: The file path is a directory instead of a file."
-msgstr "Glom:该文件路径是一个目录而非一个文件。"
+#: ../glom/glom_create_from_example.cc:122 ../glom/glom_test_connection.cc:100
+msgid "Use MySQL instead of PostgreSQL."
+msgstr "使用 MySQL 代替 PostgreSQL。"
 
-#: ../glom/glom_create_from_example.cc:314
+#: ../glom/glom_create_from_example.cc:336
 #, fuzzy
 #| msgid "Glom: The file does not exist."
 msgid "Glom: The output directory does not exist."
 msgstr "Glom:该文件不存在。"
 
-#: ../glom/glom_create_from_example.cc:324
+#: ../glom/glom_create_from_example.cc:346
 #, fuzzy
 #| msgid "Glom: The file path is a directory instead of a file."
 msgid "Glom: The output path is not a directory."
 msgstr "Glom:该文件路径是一个目录而非一个文件。"
 
-#: ../glom/glom_create_from_example.cc:422 ../glom/glom_test_connection.cc:166
+#: ../glom/glom_create_from_example.cc:459
 #, fuzzy
 #| msgid "Please enter a password for this user."
-msgid "Please enter the PostgreSQL server's password for the user %1: "
+msgid "Please enter the database server's password for the user %1: "
 msgstr "请为此用户输入一个密码。"
 
 #: ../glom/glom_export_po.cc:57
 msgid ""
 "The path at which to save the created .po file, such as /home/someuser/"
 "somefile.po ."
-msgstr ""
+msgstr "保存创建的 .po 文件的路径,例如 /home/someuser/somefile.po。"
 
 #: ../glom/glom_export_po.cc:62
 msgid ""
@@ -1522,13 +1595,13 @@ msgid "Generate a .pot template file instead of a .po file for a locale."
 msgstr ""
 
 #: ../glom/glom_export_po.cc:142 ../glom/glom_export_po_all.cc:130
-#: ../glom/glom_import_po_all.cc:131
+#: ../glom/glom_import_po_all.cc:132
 msgid "Please specify a glom file."
-msgstr ""
+msgstr "请指定一个 glom 文件。"
 
 #: ../glom/glom_export_po.cc:149
 msgid "Please use either the --locale-id option or the --template option."
-msgstr ""
+msgstr "请使用 --locale-id 选项或 --template 选项。"
 
 #: ../glom/glom_export_po.cc:180 ../glom/glom_export_po_all.cc:161
 msgid "Please specify an output path."
@@ -1546,13 +1619,13 @@ msgstr "计算失败"
 msgid "Pot file created at: %1"
 msgstr "尚未创建。"
 
-#: ../glom/glom_export_po.cc:232 ../glom/glom_export_po_all.cc:223
+#: ../glom/glom_export_po.cc:232 ../glom/glom_export_po_all.cc:221
 #, fuzzy
 #| msgid "Calculation failed"
 msgid "Po file creation failed."
 msgstr "计算失败"
 
-#: ../glom/glom_export_po.cc:236 ../glom/glom_export_po_all.cc:227
+#: ../glom/glom_export_po.cc:236 ../glom/glom_export_po_all.cc:225
 msgid "Po file created at: %1"
 msgstr ""
 
@@ -1562,13 +1635,13 @@ msgid ""
 "someuser/po_files/ ."
 msgstr ""
 
-#: ../glom/glom_export_po_all.cc:143 ../glom/glom_import_po_all.cc:144
+#: ../glom/glom_export_po_all.cc:143 ../glom/glom_import_po_all.cc:145
 #, fuzzy
 #| msgid "Glom: The file does not exist."
 msgid "The Glom file does not exist."
 msgstr "Glom:该文件不存在。"
 
-#: ../glom/glom_export_po_all.cc:153 ../glom/glom_import_po_all.cc:154
+#: ../glom/glom_export_po_all.cc:153 ../glom/glom_import_po_all.cc:155
 #, fuzzy
 #| msgid "Glom: The file path is a directory instead of a file."
 msgid "The Glom file path is a directory instead of a file."
@@ -1577,7 +1650,7 @@ msgstr "Glom:该文件路径是一个目录而非一个文件。"
 #: ../glom/glom_export_po_all.cc:174
 #, fuzzy
 #| msgid "The document could not be opened."
-msgid "The ouput directory could not be created."
+msgid "The output directory could not be created."
 msgstr "无法打开该文档。"
 
 #: ../glom/glom_export_po_all.cc:182
@@ -1590,86 +1663,70 @@ msgstr "Glom:该文件路径是一个目录而非一个文件。"
 msgid "The Glom document has no translations."
 msgstr ""
 
-#: ../glom/glom_import_po_all.cc:56
+#: ../glom/glom_import_po_all.cc:57
 msgid ""
 "The path to a directory containing .po files, such as /home/someuser/"
 "po_files/ ."
 msgstr ""
 
-#: ../glom/glom_import_po_all.cc:162
+#: ../glom/glom_import_po_all.cc:163
 #, fuzzy
 #| msgid "Glom: The file path is a directory instead of a file."
 msgid "Please specify the path to a directory containing po files."
 msgstr "Glom:该文件路径是一个目录而非一个文件。"
 
-#: ../glom/glom_import_po_all.cc:173
+#: ../glom/glom_import_po_all.cc:174
 #, fuzzy
 #| msgid "Glom: The file path is a directory instead of a file."
 msgid "Glom: The po files directory path is not a directory."
 msgstr "Glom:该文件路径是一个目录而非一个文件。"
 
-#: ../glom/glom_import_po_all.cc:213
+#: ../glom/glom_import_po_all.cc:214
 msgid "Po file import failed for locale: %1"
 msgstr ""
 
-#: ../glom/glom_import_po_all.cc:218
+#: ../glom/glom_import_po_all.cc:219
+msgid "Po file import failed during document saving for locale: %1"
+msgstr ""
+
+#: ../glom/glom_import_po_all.cc:223
 msgid "Po file imported for locale: %1 for file %2"
 msgstr ""
 
-#: ../glom/glom_test_connection.cc:68
+#: ../glom/glom_test_connection.cc:77
 msgid "The hostname of the PostgreSQL server, such as localhost."
 msgstr ""
 
-#: ../glom/glom_test_connection.cc:84
+#: ../glom/glom_test_connection.cc:93
 msgid "The specific database on the PostgreSQL server (Optional)."
 msgstr ""
 
-#: ../glom/glom_test_connection.cc:156
+#: ../glom/glom_test_connection.cc:173
 msgid "Please provide a database username."
 msgstr ""
 
-#: ../glom/glom_test_connection.cc:215
+#: ../glom/glom_test_connection.cc:183
+#, fuzzy
+#| msgid "Please enter a password for this user."
+msgid "Please enter the PostgreSQL server's password for the user %1: "
+msgstr "请为此用户输入一个密码。"
+
+#: ../glom/glom_test_connection.cc:264
 msgid ""
 "Error: Could not connect to the server even without specifying a database."
 msgstr ""
 
-#: ../glom/glom_test_connection.cc:223
+#: ../glom/glom_test_connection.cc:272
 #, fuzzy
 #| msgid "Glom could not create the specified file."
 msgid "Error: Could not connect to the specified database."
 msgstr "Glom 无法创建指定的文件。"
 
-#: ../glom/glom_test_connection.cc:229
+#: ../glom/glom_test_connection.cc:278
 msgid "Successful connection."
 msgstr "连接成功。"
 
-#: ../glom/main.cc:197
-msgid "Command-line options for glom"
-msgstr "glom 的命令行选项"
-
-#: ../glom/main.cc:207
-msgid "The Filename"
-msgstr "文件名"
-
-#: ../glom/main.cc:217
-msgid "Whether the filename is a .tar.gz backup to be restored."
-msgstr "此文件名是否为一个要恢复的 .tar.gz 备份。"
-
-#: ../glom/main.cc:222
-msgid ""
-"Do not automatically stop the database server if Glom quits. This is helpful "
-"for debugging with gdb."
-msgstr ""
-
-#: ../glom/main.cc:227
-msgid "Show the generated SQL queries on stdout, for debugging."
-msgstr "在标准输出(stdout)中显示生成的 SQL 查询语句,用于调试。"
-
-#: ../glom/main.cc:232
-msgid "Show how Glom outputs a date in this locale, then stop."
-msgstr "显示 Glom 如何输出此区域中的日期,然后停止。"
-
-#: ../glom/main.cc:245
+#: ../glom/main.cc:198
 msgid ""
 "You seem to be running Glom as a user with administrator privileges. Glom "
 "may not be run with such privileges for security reasons.\n"
@@ -1679,7 +1736,7 @@ msgstr ""
 "请以普通用户身份登录您的系统。"
 
 #. Warn the user:
-#: ../glom/main.cc:259
+#: ../glom/main.cc:212
 msgid ""
 "You seem to be running Glom as root. Glom may not be run as root.\n"
 "Please login to your system as a normal user."
@@ -1687,20 +1744,24 @@ msgstr ""
 "您似乎在以 root 身份运行 Glom。Glom 不能以 root 身份运行。\n"
 "请以普通用户身份登录您的系统。"
 
-#: ../glom/main.cc:265
+#: ../glom/main.cc:221
 msgid "Running As Root"
 msgstr "正以 root 身份运行"
 
 #. Show message to the user about the broken installation:
 #. This is a packaging bug, but it would probably annoy packagers to mention that in the dialog:
 #. Show message to the user about the broken installation:
-#: ../glom/main.cc:308 ../glom/main.cc:321 ../glom/main.cc:564
+#. This is a packaging bug, but it would probably annoy packagers to mention that in the dialog:
+#. Unlike for PostgreSQL, this warning is only shown if MySQL was specified in the build.
+#. Show message to the user about the broken installation:
+#: ../glom/main.cc:264 ../glom/main.cc:282 ../glom/main.cc:320
+#: ../glom/main.cc:333 ../glom/main.cc:516
 msgid "Incomplete Glom Installation"
 msgstr "Glom 安装不完整"
 
 #. use_markup
 #. modal
-#: ../glom/main.cc:309
+#: ../glom/main.cc:265
 msgid ""
 "Your installation of Glom is not complete, because PostgreSQL is not "
 "available on your system. PostgreSQL is needed for self-hosting of Glom "
@@ -1713,13 +1774,12 @@ msgstr ""
 "\n"
 "您可以现在安装 PostgreSQL 来补全 Glom 安装。"
 
-#: ../glom/main.cc:311
+#: ../glom/main.cc:267
 msgid "Install PostgreSQL"
 msgstr "安装 PostgreSQL"
 
-#. use_markup
-#. modal
-#: ../glom/main.cc:322
+#. Show message to the user about the broken installation:
+#: ../glom/main.cc:277
 msgid ""
 "Your installation of Glom is not complete, because PostgreSQL is not "
 "available on your system. PostgreSQL is needed for self-hosting of Glom "
@@ -1733,8 +1793,58 @@ msgstr ""
 "\n"
 "请向您的厂商或您的系统管理员报告这个 bug,"
 
+#. use_markup
+#. modal
+#: ../glom/main.cc:321
+#, fuzzy
+#| msgid ""
+#| "Your installation of Glom is not complete, because PostgreSQL is not "
+#| "available on your system. PostgreSQL is needed for self-hosting of Glom "
+#| "databases.\n"
+#| "\n"
+#| "You may now install PostgreSQL to complete the Glom installation."
+msgid ""
+"Your installation of Glom is not complete, because MySQL is not available on "
+"your system. MySQL is needed for self-hosting of some Glom databases.\n"
+"\n"
+"You may now install MySQL to complete the Glom installation."
+msgstr ""
+"您安装的 Glom 不完整。因为系统中没有 PostgreSQL。Glom 数据库的自我宿主(self-"
+"hosting)需要 PostgreSQL。\n"
+"\n"
+"您可以现在安装 PostgreSQL 来补全 Glom 安装。"
+
+#: ../glom/main.cc:323
+#, fuzzy
+#| msgid "Install PostgreSQL"
+msgid "Install MySQL"
+msgstr "安装 PostgreSQL"
+
+#. use_markup
+#. modal
+#: ../glom/main.cc:334
+#, fuzzy
+#| msgid ""
+#| "Your installation of Glom is not complete, because PostgreSQL is not "
+#| "available on your system. PostgreSQL is needed for self-hosting of Glom "
+#| "databases.\n"
+#| "\n"
+#| "Please report this bug to your vendor, or your system administrator so it "
+#| "can be corrected."
+msgid ""
+"Your installation of Glom is not complete, because MySQL is not available on "
+"your system. MySQL is needed for self-hosting of some Glom databases.\n"
+"\n"
+"Please report this bug to your vendor, or your system administrator so it "
+"can be corrected."
+msgstr ""
+"您安装的 Glom 不完整,因为您的系统中没有 PostgreSQL。Glom 数据库的自我宿主"
+"(self-hosting)需要 PostgreSQL。\n"
+"\n"
+"请向您的厂商或您的系统管理员报告这个 bug,"
+
 #. The python module could not be imported by Glom, so warn the user:
-#: ../glom/main.cc:338
+#: ../glom/main.cc:350
 msgid ""
 "Your installation of Glom is not complete, because the Glom Python module is "
 "not available on your system.\n"
@@ -1746,12 +1856,12 @@ msgstr ""
 "\n"
 "请向您的计算机厂商或您的系统管理员报告这个 bug,以便修复它。"
 
-#: ../glom/main.cc:340
+#: ../glom/main.cc:355
 msgid "Glom Python Module Not Installed"
 msgstr "Glom Python 模块未安装"
 
 #. The python module could not be imported by Glom, so warn the user:
-#: ../glom/main.cc:353
+#: ../glom/main.cc:368
 #, fuzzy
 #| msgid ""
 #| "Your installation of Glom is not complete, because the gda Python module "
@@ -1770,14 +1880,14 @@ msgstr ""
 "\n"
 "请向您的厂商或您的系统管理员报告这个 bug,以便修复它。"
 
-#: ../glom/main.cc:355
+#: ../glom/main.cc:373
 #, fuzzy
 #| msgid "gda Python Module Not Installed"
 msgid "gi.repository Python Module Not Installed"
 msgstr "gda Python 模块未安装"
 
 #. The python module could not be imported by Glom, so warn the user:
-#: ../glom/main.cc:368
+#: ../glom/main.cc:386
 #, fuzzy
 #| msgid ""
 #| "Your installation of Glom is not complete, because the gda Python module "
@@ -1796,14 +1906,14 @@ msgstr ""
 "\n"
 "请向您的厂商或您的系统管理员报告这个 bug,以便修复它。"
 
-#: ../glom/main.cc:370
+#: ../glom/main.cc:391
 #, fuzzy
 #| msgid "gda Python Module Not Installed"
 msgid "gi.repository.Gda Python Module Not Installed"
 msgstr "gda Python 模块未安装"
 
 #. The Postgres provider was not found, so warn the user:
-#: ../glom/main.cc:562
+#: ../glom/main.cc:511
 msgid ""
 "Your installation of Glom is not complete, because the PostgreSQL libgda "
 "provider is not available on your system. This provider is needed to access "
@@ -1817,26 +1927,78 @@ msgstr ""
 "\n"
 "请向您的计算机厂商或您的系统管理员报告这个 bug,以便修复它。"
 
-#. Don't add ContextLayout in client only mode because it would never
-#. be sensitive anyway
-#: ../glom/mode_data/box_data_calendar_related.cc:512
-#: ../glom/mode_data/db_adddel/db_adddel.cc:249
-#: ../ui/developer/window_data_layout.glade.h:28
-msgid "Layout"
-msgstr "布局"
+#: ../glom/main_local_options.cc:39
+#, fuzzy
+#| msgid "Glom options"
+msgid "Extra Glom options"
+msgstr "Glom 选项"
+
+#: ../glom/main_local_options.cc:39
+#, fuzzy
+#| msgid "Command-line options for glom"
+msgid "Extra command-line options for glom"
+msgstr "glom 的命令行选项"
+
+#: ../glom/main_local_options.cc:52
+msgid "Show how Glom outputs a date in this locale, then stop."
+msgstr "显示 Glom 如何输出此区域中的日期,然后停止。"
+
+#: ../glom/main_remote_options.cc:31
+#, fuzzy
+#| msgid "Glom options"
+msgid "Main Glom options"
+msgstr "Glom 选项"
+
+#: ../glom/main_remote_options.cc:31
+#, fuzzy
+#| msgid "Command-line options for glom"
+msgid "Main command-line options for glom"
+msgstr "glom 的命令行选项"
+
+#: ../glom/main_remote_options.cc:39
+msgid "The Filename"
+msgstr "文件名"
+
+#: ../glom/main_remote_options.cc:44
+msgid "Whether the filename is a .tar.gz backup to be restored."
+msgstr "此文件名是否为一个要恢复的 .tar.gz 备份。"
 
-#: ../glom/mode_data/box_data.cc:149
+#: ../glom/main_remote_options.cc:49
 msgid ""
-"You have not entered any find criteria. Try entering information in the "
-"fields."
+"Do not automatically stop the database server if Glom quits. This is helpful "
+"for debugging with gdb."
 msgstr ""
 
-#: ../glom/mode_data/box_data.cc:151
-#: ../glom/mode_data/datawidget/dialog_choose_id.cc:109
-msgid "No Find Criteria"
-msgstr ""
+#: ../glom/main_remote_options.cc:54
+msgid "Show the generated SQL queries on stdout, for debugging."
+msgstr "在标准输出(stdout)中显示生成的 SQL 查询语句,用于调试。"
 
-#: ../glom/mode_data/box_data.cc:190
+#: ../glom/mode_data/box_data_calendar_related.cc:494
+#: ../glom/mode_design/users/dialog_groups_list.cc:79
+#: ../glom/print_layout/canvas_print_layout.cc:286
+#: ../glom/utility_widgets/adddel/adddel.cc:213
+#: ../glom/mode_data/db_adddel/db_adddel.cc:218
+#: ../glom/mode_data/db_adddel/db_adddel.cc:250
+#: ../data/ui/operator/window_main.glade.h:13
+#: ../data/ui/developer/dialog_fieldslist.glade.h:10
+#: ../data/ui/developer/dialog_group_by.glade.h:8
+#: ../data/ui/developer/dialog_sort_fields.glade.h:10
+#: ../data/ui/developer/window_data_layout_export.glade.h:7
+#: ../data/ui/developer/window_data_layout.glade.h:28
+#: ../data/ui/developer/window_field_definition_edit.glade.h:13
+#: ../data/ui/developer/window_print_layout_edit.glade.h:4
+#: ../data/ui/developer/window_report_layout.glade.h:16
+#: ../data/ui/developer/window_users.glade.h:9
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../glom/mode_data/box_data_calendar_related.cc:495
+#: ../glom/mode_data/db_adddel/db_adddel.cc:254
+#: ../data/ui/operator/window_main.glade.h:28
+msgid "_Layout"
+msgstr "布局(_L)"
+
+#: ../glom/mode_data/box_data.cc:189
 msgid ""
 "This data cannot be stored in the database because you have not provided a "
 "primary key.\n"
@@ -1844,10 +2006,44 @@ msgid ""
 msgstr ""
 
 #. Ask user to confirm loss of data:
-#: ../glom/mode_data/box_data.cc:192
+#: ../glom/mode_data/box_data.cc:191
 msgid "No primary key value"
 msgstr ""
 
+#: ../glom/mode_data/box_data_details.cc:48
+#: ../glom/utility_widgets/adddel/adddel_withbuttons.cc:33
+#: ../glom/utility_widgets/adddel/adddel_withbuttons.cc:43
+#: ../glom/mode_data/db_adddel/db_adddel.cc:251
+#: ../glom/mode_data/db_adddel/db_adddel_withbuttons.cc:33
+#: ../data/ui/developer/dialog_choose_user.glade.h:4
+#: ../data/ui/developer/dialog_fieldslist.glade.h:8
+#: ../data/ui/developer/dialog_notebook.glade.h:8
+#: ../data/ui/developer/dialog_script_library.glade.h:6
+#: ../data/ui/developer/dialog_sort_fields.glade.h:9
+#: ../data/ui/developer/window_data_layout_export.glade.h:5
+#: ../data/ui/developer/window_report_layout.glade.h:9
+#: ../data/ui/developer/window_users.glade.h:7
+#, fuzzy
+#| msgid "_Add Page"
+msgid "_Add"
+msgstr "添加页面(_A)"
+
+#: ../glom/mode_data/box_data_details.cc:50
+msgid "_First"
+msgstr ""
+
+#: ../glom/mode_data/box_data_details.cc:51
+msgid "_Back"
+msgstr ""
+
+#: ../glom/mode_data/box_data_details.cc:52
+msgid "_Forward"
+msgstr ""
+
+#: ../glom/mode_data/box_data_details.cc:53
+msgid "_Last"
+msgstr ""
+
 #: ../glom/mode_data/box_data_details.cc:112
 msgid "Create a new record."
 msgstr "创建一条新记录。"
@@ -1872,31 +2068,31 @@ msgstr "查看列表中的下一条记录。"
 msgid "View the last record in the list."
 msgstr "查看列表中的最后一条记录。"
 
-#: ../glom/mode_data/box_data_details.cc:417
+#: ../glom/mode_data/box_data_details.cc:424
 msgid "Layout Contains No Fields"
 msgstr "布局中未包含任何字段"
 
-#: ../glom/mode_data/box_data_details.cc:417
+#: ../glom/mode_data/box_data_details.cc:424
 msgid ""
 "There are no fields on the layout, so there is no way to enter data in a new "
 "record."
 msgstr "布局中没有任何字段,因此无法在新记录中输入数据。"
 
 #. Tell user that a primary key is needed to delete a record:
-#: ../glom/mode_data/box_data_details.cc:444
+#: ../glom/mode_data/box_data_details.cc:451
 msgid "No primary key value."
 msgstr "没有主键值。"
 
-#: ../glom/mode_data/box_data_details.cc:445
+#: ../glom/mode_data/box_data_details.cc:452
 msgid "This record cannot be deleted because there is no primary key."
 msgstr "该记录无法删除,因为没有主键。"
 
 #. Warn user that they can't choose their own primary key:
-#: ../glom/mode_data/box_data_details.cc:851
+#: ../glom/mode_data/box_data_details.cc:862
 msgid "Primary key auto increments"
 msgstr "主键自动增加"
 
-#: ../glom/mode_data/box_data_details.cc:852
+#: ../glom/mode_data/box_data_details.cc:863
 msgid ""
 "The primary key is auto-incremented.\n"
 " You may not enter your own primary key value."
@@ -1904,164 +2100,171 @@ msgstr ""
 "主键是自动增加的。\n"
 "您不能自己输入主键值。"
 
-#: ../glom/mode_data/box_data_portal.cc:337
+#: ../glom/mode_data/box_data_portal.cc:389
 msgid "No Corresponding Record Exists"
 msgstr "没有对应记录"
 
-#: ../glom/mode_data/box_data_portal.cc:337
+#: ../glom/mode_data/box_data_portal.cc:389
 msgid ""
 "No record with this value exists. Therefore navigation to the related record "
 "is not possible."
 msgstr "没有含这个值的记录。因此不能导航到相关记录。"
 
-#: ../glom/mode_data/flowtablewithfields.cc:1187
-#: ../glom/utility_widgets/notebooklabelglom.cc:75
-#: ../glom/utility_widgets/notebooklabelglom.cc:115
+#: ../glom/mode_data/flowtablewithfields.cc:1105
+#: ../glom/utility_widgets/notebooklabelglom.cc:70
+#: ../glom/utility_widgets/notebooklabelglom.cc:117
 msgid "New Group"
 msgstr "新建组"
 
-#: ../glom/mode_data/flowtablewithfields.cc:1193
-#: ../glom/mode_design/layout/dialog_layout_details.cc:735
+#: ../glom/mode_data/flowtablewithfields.cc:1111
+#: ../glom/mode_design/layout/dialog_layout_details.cc:726
 msgid "notebook"
 msgstr "笔记本"
 
 #. Note to translators: This is the default name (not seen by most users) for a notebook tab.
-#: ../glom/mode_data/flowtablewithfields.cc:1199
+#: ../glom/mode_data/flowtablewithfields.cc:1117
 msgid "tab1"
 msgstr "页1"
 
 #. Note to translators: This is the default label text for a notebook tab.
-#: ../glom/mode_data/flowtablewithfields.cc:1202
+#: ../glom/mode_data/flowtablewithfields.cc:1120
 msgid "Tab One"
 msgstr "表一"
 
-#: ../glom/mode_data/flowtablewithfields.cc:1215
+#: ../glom/mode_data/flowtablewithfields.cc:1133
 msgid "button"
 msgstr "按钮"
 
-#: ../glom/mode_data/flowtablewithfields.cc:1216
-#: ../glom/mode_design/layout/dialog_layout_details.cc:661
+#: ../glom/mode_data/flowtablewithfields.cc:1134
+#: ../glom/mode_design/layout/dialog_layout_details.cc:652
 msgid "New Button"
 msgstr "新建按钮"
 
 #. Note to translators: This is the default contents of a text item on a print layout:
-#: ../glom/mode_data/flowtablewithfields.cc:1222
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:457
+#: ../glom/mode_data/flowtablewithfields.cc:1140
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:387
 msgid "text"
 msgstr "文本"
 
-#: ../glom/mode_data/flowtablewithfields.cc:1223
+#: ../glom/mode_data/flowtablewithfields.cc:1141
 msgid "New Text"
 msgstr "新建文本"
 
 #. TODO: Use a real English sentence here?
-#: ../glom/mode_data/flowtablewithfields.cc:1391
+#: ../glom/mode_data/flowtablewithfields.cc:1290
 msgid "Delete whole group \"%1\"?"
 msgstr "删除整个组“%1”吗?"
 
 #. TODO: Use a real English sentence here:
-#: ../glom/mode_data/flowtablewithfields.cc:1397
+#: ../glom/mode_data/flowtablewithfields.cc:1296
 msgid "Delete whole group?"
 msgstr "删除整个组?"
 
-#. Translators: This is a noun. It is a notebook tab title.
-#. Details column:
-#: ../glom/mode_data/notebook_data.cc:66
-#: ../glom/mode_design/report_layout/dialog_layout_report.cc:214
-#: ../glom/mode_find/notebook_find.cc:39
-msgid "Details"
-msgstr "细节"
-
 #. Translators: This is a title, not an action.
-#: ../glom/mode_data/notebook_data.cc:72
+#: ../glom/mode_data/notebook_data.cc:48
 msgid "List Or Details View"
 msgstr "列表或详细视图"
 
 #. Don't allow a relationship to be added twice.
-#: ../glom/mode_design/box_db_table_relationships.cc:46
+#: ../glom/mode_design/box_db_table_relationships.cc:49
 msgid ""
 "This relationship already exists. Please choose a different relationship name"
 msgstr "此关系已存在。请另选一个关系名"
 
 #. Translators: FROM as in SQL's FROM
-#: ../glom/mode_design/box_db_table_relationships.cc:51
+#: ../glom/mode_design/box_db_table_relationships.cc:54
 msgid "From Field"
 msgstr "从字段"
 
-#: ../glom/mode_design/box_db_table_relationships.cc:53
+#: ../glom/mode_design/box_db_table_relationships.cc:56
 msgid "To Field"
 msgstr "到字段"
 
-#: ../glom/mode_design/box_db_table_relationships.cc:54
-#: ../ui/developer/dialog_layout_field_properties.glade.h:4
+#: ../glom/mode_design/box_db_table_relationships.cc:57
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:5
 msgid "Allow Editing"
 msgstr "允许编辑"
 
-#: ../glom/mode_design/box_db_table_relationships.cc:55
+#: ../glom/mode_design/box_db_table_relationships.cc:58
 msgid "Automatic Creation"
 msgstr "自动创建"
 
-#: ../glom/mode_design/box_db_table_relationships.cc:57
-#: ../glom/navigation/box_tables.cc:143
+#: ../glom/mode_design/box_db_table_relationships.cc:60
+#: ../glom/navigation/box_tables.cc:138
 msgid "Title (Singular Form)"
 msgstr "标题(单数形式)"
 
-#: ../glom/mode_design/dialog_database_preferences.cc:63
+#: ../glom/mode_design/dialog_database_preferences.cc:64
 msgid "Next Value"
 msgstr "下个值"
 
-#: ../glom/mode_design/dialog_design.cc:52
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:640
-#: ../ui/developer/window_design.glade.h:3
+#: ../glom/mode_design/dialog_design.cc:49
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:569
+#: ../data/ui/developer/window_design.glade.h:3
 msgid "None selected"
 msgstr "没有选中"
 
-#: ../glom/mode_design/dialog_initial_password.cc:83
+#: ../glom/mode_design/dialog_initial_password.cc:79
 msgid "Username Is Empty"
 msgstr "用户名为空"
 
-#: ../glom/mode_design/dialog_initial_password.cc:83
+#: ../glom/mode_design/dialog_initial_password.cc:79
 msgid "Please enter a login name for the new user."
 msgstr "请输入一个新用户的的登录名。"
 
-#: ../glom/mode_design/dialog_initial_password.cc:88
-#: ../glom/mode_design/users/dialog_user.cc:53
+#: ../glom/mode_design/dialog_initial_password.cc:84
+#: ../glom/mode_design/users/dialog_user.cc:54
 msgid "Passwords Do Not Match"
 msgstr "密码不符"
 
-#: ../glom/mode_design/dialog_initial_password.cc:88
-#: ../glom/mode_design/users/dialog_user.cc:53
+#: ../glom/mode_design/dialog_initial_password.cc:84
+#: ../glom/mode_design/users/dialog_user.cc:54
 msgid ""
 "The entered password does not match the entered password confirmation. "
 "Please try again."
 msgstr "输入的密码与确认密码不一致。请重试。"
 
-#: ../glom/mode_design/dialog_initial_password.cc:93
-#: ../glom/mode_design/users/dialog_user.cc:58
+#: ../glom/mode_design/dialog_initial_password.cc:89
+#: ../glom/mode_design/users/dialog_user.cc:59
 msgid "Password Is Empty"
 msgstr "密码为空"
 
-#: ../glom/mode_design/dialog_initial_password.cc:93
-#: ../glom/mode_design/users/dialog_user.cc:58
+#: ../glom/mode_design/dialog_initial_password.cc:89
+#: ../glom/mode_design/users/dialog_user.cc:59
 msgid "Please enter a password for this user."
 msgstr "请为此用户输入一个密码。"
 
 #. Don't allow adding of fields that already exist.
-#: ../glom/mode_design/fields/box_db_table_definition.cc:55
-#: ../glom/mode_design/fields/box_db_table_definition.cc:333
-msgid "This field already exists. Please choose a different field name"
+#: ../glom/mode_design/fields/box_db_table_definition.cc:66
+#, fuzzy
+#| msgid "This field already exists. Please choose a different field name"
+msgid "This field already exists. Please choose a different field name."
 msgstr "此字段已存在。请另选一个字段名"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:59
+#: ../glom/mode_design/fields/box_db_table_definition.cc:70
 msgid "Type"
 msgstr "类型"
 
+#. TODO: Auto-size columns.
+#. Setup the buttons:
+#: ../glom/mode_design/fields/box_db_table_definition.cc:75
+#, fuzzy
+#| msgid "Field Definition"
+msgid "_Field Definition"
+msgstr "字段定义"
+
+#: ../glom/mode_design/fields/box_db_table_definition.cc:76
+#, fuzzy
+#| msgid "Default Formatting"
+msgid "_Default Formatting"
+msgstr "默认格式"
+
 #. TODO: Only show this when there are > 100 records?
-#: ../glom/mode_design/fields/box_db_table_definition.cc:263
+#: ../glom/mode_design/fields/box_db_table_definition.cc:289
 msgid "Recalculation Required"
 msgstr "需要重新计算"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:264
+#: ../glom/mode_design/fields/box_db_table_definition.cc:290
 msgid ""
 "You have changed the calculation used by this field so Glom must recalculate "
 "the value in all records. If the table contains many records then this could "
@@ -2070,15 +2273,15 @@ msgstr ""
 "您修改了该字段使用的计算方法,因此 Glom 必须重新计算所有记录中的值。若表中包"
 "含大量记录,那么这可能会花很长时间。"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:269
+#: ../glom/mode_design/fields/box_db_table_definition.cc:295
 msgid "Recalculate"
 msgstr "重新计算"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:278
+#: ../glom/mode_design/fields/box_db_table_definition.cc:304
 msgid "Invalid database structure"
 msgstr "数据库结构无效"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:279
+#: ../glom/mode_design/fields/box_db_table_definition.cc:305
 msgid ""
 "This database field was created or edited outside of Glom. It has a data "
 "type that is not supported by Glom. Your system administrator may be able to "
@@ -2087,80 +2290,86 @@ msgstr ""
 "此数据库字段是在 Glom 外创建或编辑的。它含有 Glom 不支持的数据类型。您的系统"
 "管理员或许能修正此问题。"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:287
+#: ../glom/mode_design/fields/box_db_table_definition.cc:313
 msgid "Primary key required"
 msgstr "需要主键"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:288
+#: ../glom/mode_design/fields/box_db_table_definition.cc:314
 msgid ""
 "You may not unset the primary key because the table must have a primary key. "
 "You may set another field as the primary key instead."
 msgstr "您不能取消该主键,因为表必须有一个主键。您可以另选一个字段作为主键。"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:300
+#: ../glom/mode_design/fields/box_db_table_definition.cc:326
 msgid "Field contains empty values."
 msgstr "字段包含空的值。"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:300
+#: ../glom/mode_design/fields/box_db_table_definition.cc:326
 msgid ""
 "The field may not yet be used as a primary key because it contains empty "
 "values."
 msgstr "该字段尚不能作为主键,因为它包含空的值。"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:309
+#: ../glom/mode_design/fields/box_db_table_definition.cc:335
 msgid "Field contains non-unique values."
 msgstr "字段包含不惟一的值。"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:309
+#: ../glom/mode_design/fields/box_db_table_definition.cc:335
 msgid ""
 "The field may not yet be used as a primary key because it contains values "
 "that are not unique."
 msgstr "该字段尚不能作为主键,因为它包含某些不惟一的值。"
 
 #. Ask the user to confirm this major change:
-#: ../glom/mode_design/fields/box_db_table_definition.cc:314
+#: ../glom/mode_design/fields/box_db_table_definition.cc:340
 msgid "Change primary key"
 msgstr "更改主键"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:315
+#: ../glom/mode_design/fields/box_db_table_definition.cc:341
 msgid ""
 "Are you sure that you wish to set this field as the primary key, instead of "
 "the existing primary key?"
 msgstr "您确定要将现在的主键更改为这个字段吗?"
 
-#: ../glom/mode_design/fields/box_db_table_definition.cc:320
+#: ../glom/mode_design/fields/box_db_table_definition.cc:346
 msgid "Change Primary Key"
 msgstr "更改主键"
 
 #. Warn the user and refuse to make the change:
-#: ../glom/mode_design/fields/box_db_table_definition.cc:332
+#: ../glom/mode_design/fields/box_db_table_definition.cc:358
 msgid "Field Name Already Exists"
 msgstr "字段名已存在"
 
-#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:102
+#: ../glom/mode_design/fields/box_db_table_definition.cc:359
+msgid "This field already exists. Please choose a different field name"
+msgstr "此字段已存在。请另选一个字段名"
+
+#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:99
 msgid "Calculation Error"
 msgstr "计算错误"
 
-#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:102
+#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:99
 msgid "The calculation does not have a return statement."
 msgstr "计算没有返回语句。"
 
-#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:144
+#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:142
 msgid "Calculation result"
 msgstr "计算结果"
 
-#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:144
+#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:142
 msgid ""
 "The result of the calculation is:\n"
 "%1"
-msgstr "计算结果为:\n%1"
+msgstr ""
+"计算结果为:\n"
+"%1"
 
-#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:146
-#: ../glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc:137
+#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:144
+#: ../glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc:135
 msgid "Calculation failed"
 msgstr "计算失败"
 
-#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:146
+#: ../glom/mode_design/fields/dialog_fieldcalculation.cc:144
 #, fuzzy, c-format
 #| msgid "The calculation failed with this error:\n"
 msgid ""
@@ -2168,7 +2377,7 @@ msgid ""
 "%s"
 msgstr "计算失败,错误为:\n"
 
-#: ../glom/mode_design/fields/dialog_fielddefinition.cc:158
+#: ../glom/mode_design/fields/dialog_fielddefinition.cc:147
 msgid "Default Value"
 msgstr "默认值"
 
@@ -2178,92 +2387,92 @@ msgstr "默认值"
 #. otherwise we get this warning:
 #. " unable to set property `text' of type `gchararray' from value of type `glibmm__CustomPointer_Pc' "
 #. TODO: Add a template specialization to Glib::ObjectBase::set_property() to allow this?
-#: ../glom/mode_design/layout/combobox_fields.cc:215
+#: ../glom/mode_design/layout/combobox_fields.cc:205
 msgid "(None)"
 msgstr "(无)"
 
-#: ../glom/mode_design/layout/combobox_relationship.cc:267
+#: ../glom/mode_design/layout/combobox_relationship.cc:287
 msgid " Via: %1::%2"
 msgstr "经由:%1::%2"
 
-#: ../glom/mode_design/layout/combobox_relationship.cc:271
+#: ../glom/mode_design/layout/combobox_relationship.cc:293
 msgid " Via: %1"
 msgstr "经由:%1"
 
-#: ../glom/mode_design/layout/dialog_layout_calendar_related.cc:239
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:294
+#: ../glom/mode_design/layout/dialog_layout_calendar_related.cc:240
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:304
 msgid "None: No visible tables are specified by the fields."
 msgstr "无:该字段未指定可见的表。"
 
 #. Columns-count column:
 #. Note to translators: This is the number of columns in a group (group being a noun)
-#: ../glom/mode_design/layout/dialog_layout_details.cc:128
+#: ../glom/mode_design/layout/dialog_layout_details.cc:130
 msgid "Group Columns"
 msgstr "组的列数"
 
 #. Column-Width column: (only for list views)
 #. Note to translators: This is a name (the width of a UI element in the display), not an action.
-#: ../glom/mode_design/layout/dialog_layout_details.cc:141
+#: ../glom/mode_design/layout/dialog_layout_details.cc:143
 msgid "Display Width"
 msgstr "显示宽度"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:686
+#: ../glom/mode_design/layout/dialog_layout_details.cc:677
 msgid "Text Title"
 msgstr "文本标题"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:711
+#: ../glom/mode_design/layout/dialog_layout_details.cc:702
 msgid "Image Title"
 msgstr "图像标题"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:866
+#: ../glom/mode_design/layout/dialog_layout_details.cc:857
 msgid "group"
 msgstr "组"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:958
-#: ../ui/developer/dialog_notebook.glade.h:2
+#: ../glom/mode_design/layout/dialog_layout_details.cc:949
+#: ../data/ui/developer/dialog_notebook.glade.h:1
 msgid "Notebook Tabs"
 msgstr "笔记本标签页"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:958
+#: ../glom/mode_design/layout/dialog_layout_details.cc:949
 msgid "Add child groups to the notebook to add tabs."
 msgstr "向笔记本添加子组来增加标签页"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1121
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1119
 msgid "Related Calendar: %1"
 msgstr "相关日历:%1"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1123
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1121
 msgid "Related List: %1"
 msgstr "相关列表:%1"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1140
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1138
 msgid "Field: %1"
 msgstr "字段:%1"
 
-#: ../glom/mode_design/layout/dialog_layout_details.cc:1199
+#: ../glom/mode_design/layout/dialog_layout_details.cc:1197
 msgid "(Notebook)"
 msgstr "(笔记本)"
 
 #. Append the View columns:
-#: ../glom/mode_design/layout/dialog_layout_export.cc:55
+#: ../glom/mode_design/layout/dialog_layout_export.cc:54
 msgid "Fields"
 msgstr "字段"
 
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:406
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:414
 msgid "Invalid Relationship"
 msgstr "关系无效"
 
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:407
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:415
 msgid ""
 "The relationship may not be used to show related records because the "
 "relationship does not specify a field in the related table."
 msgstr "该关系不能用来显示相关记录,因为此关系未指定相关表中的某个字段。"
 
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:413
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:421
 msgid "Relationship Uses a Related Primary Key"
 msgstr "关系使用了相关的主键"
 
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:414
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:422
 msgid ""
 "The relationship may not be used to show related records because the "
 "relationship uses a primary key field in the related table, which must "
@@ -2273,11 +2482,11 @@ msgstr ""
 "该关系不能用来显示相关记录,因为此关系使用了相关表中的主键字段,该字段必须包"
 "含惟一的值。这可以防止此关系指定多个相关记录。"
 
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:420
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:428
 msgid "Relationship Uses a Related Unique Field"
 msgstr "关系使用相关的惟一字段"
 
-#: ../glom/mode_design/layout/dialog_layout_list_related.cc:421
+#: ../glom/mode_design/layout/dialog_layout_list_related.cc:429
 msgid ""
 "The relationship may not be used to show related records because the "
 "relationship uses a unique-values field in the related table. This would "
@@ -2287,44 +2496,44 @@ msgstr ""
 "止此关系指定多个相关记录。"
 
 #. Translators: This is Automatic text alignment.
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:115
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:117
 msgid "Automatic"
 msgstr "自动"
 
 #. Translators: This is Left text alignment.
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:119
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:121
 msgid "Left"
 msgstr "左对齐"
 
 #. Translators: This is Right text alignment.
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:123
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:125
 msgid "Right"
 msgstr "右对齐"
 
 #. Give it access to the document.
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:166
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:168
 msgid "Extra Fields"
 msgstr "额外字段"
 
 #. Give it access to the document.
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:174
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:176
 msgid "Sort Order"
 msgstr "排序顺序"
 
 #. Add labels (because we will hide the checkboxes):
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:201
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:203
 msgid "Font"
 msgstr "字体"
 
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:204
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:206
 msgid "Foreground Color"
 msgstr "前景色"
 
-#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:207
+#: ../glom/mode_design/layout/layout_item_dialogs/box_formatting.cc:209
 msgid "Background Color"
 msgstr "背景色"
 
-#: ../glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc:137
+#: ../glom/mode_design/layout/layout_item_dialogs/dialog_buttonscript.cc:135
 #, fuzzy
 #| msgid "The calculation failed with this error:\n"
 msgid ""
@@ -2332,15 +2541,15 @@ msgid ""
 "%1"
 msgstr "计算失败,错误为:\n"
 
-#: ../glom/mode_design/layout/layout_item_dialogs/dialog_formatting.cc:33
-#: ../ui/developer/dialog_fieldslist.glade.h:2
-#: ../ui/developer/dialog_group_by.glade.h:4
-#: ../ui/developer/window_data_layout.glade.h:27
+#: ../glom/mode_design/layout/layout_item_dialogs/dialog_formatting.cc:31
+#: ../data/ui/developer/dialog_fieldslist.glade.h:9
+#: ../data/ui/developer/dialog_group_by.glade.h:5
+#: ../data/ui/developer/window_data_layout.glade.h:27
 msgid "Formatting"
 msgstr "格式"
 
 #. Give it access to the document.
-#: ../glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc:161
+#: ../glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc:163
 msgid "Group By - Secondary Fields"
 msgstr "分组依据 - 次要字段"
 
@@ -2351,275 +2560,155 @@ msgstr "升序"
 #. Append the View columns:
 #. Use set_cell_data_func() to give more control over the cell attributes depending on the row:
 #. Name column:
-#: ../glom/mode_design/report_layout/dialog_layout_report.cc:154
-#: ../glom/mode_design/report_layout/dialog_layout_report.cc:205
+#: ../glom/mode_design/report_layout/dialog_layout_report.cc:153
+#: ../glom/mode_design/report_layout/dialog_layout_report.cc:204
 msgid "Part"
 msgstr "部分"
 
 #. Don't allow a relationship to be added twice.
-#: ../glom/mode_design/print_layouts/box_print_layouts.cc:95
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:93
 msgid "This item already exists. Please choose a different item name"
 msgstr "该项已存在。请另选一个项目名"
 
-#: ../glom/mode_design/print_layouts/box_print_layouts.cc:223
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:219
 msgid "Are you sure that you want to rename this print layout?"
 msgstr "您确定要重命名此打印布局吗?"
 
 #. TODO: Show old and new names?
-#: ../glom/mode_design/print_layouts/box_print_layouts.cc:224
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:220
 msgid "<b>Rename Print Layout</b>"
 msgstr "<b>重命名打印布局</b>"
 
-#: ../glom/mode_design/print_layouts/box_print_layouts.cc:226
-#: ../glom/navigation/box_tables.cc:403
+#: ../glom/mode_design/print_layouts/box_print_layouts.cc:222
+#: ../glom/navigation/box_tables.cc:420
 msgid "Rename"
 msgstr "重命名"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:30
-#: ../glom/utility_widgets/layouttoolbar.cc:32
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:29
+#: ../glom/utility_widgets/layouttoolbar.cc:31
 msgid "Items"
 msgstr "项目"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:31
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:30
 msgid "Lines"
 msgstr "行"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:32
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:31
 msgid "Records"
 msgstr "记录"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:34
-#: ../glom/utility_widgets/layouttoolbar.cc:39
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:33
+#: ../glom/utility_widgets/layouttoolbar.cc:38
 msgid "Database Field"
 msgstr "数据库字段"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:34
-#: ../glom/utility_widgets/layouttoolbar.cc:39
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:33
+#: ../glom/utility_widgets/layouttoolbar.cc:38
 msgid "Drag this to the layout to add a new database field."
 msgstr "将它拖放到布局中来添加一个新数据库字段。"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:36
-#: ../glom/utility_widgets/layouttoolbar.cc:45
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:35
+#: ../glom/utility_widgets/layouttoolbar.cc:44
 msgid "Drag this to the layout to add a new static text box."
 msgstr "将它拖放到布局中来添加一个新静态文本框。"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:38
-#: ../glom/utility_widgets/layouttoolbar.cc:47
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:37
+#: ../glom/utility_widgets/layouttoolbar.cc:46
 msgid "Drag this to the layout to add a new static image."
 msgstr "将它拖放到布局中来添加一个新静态图像。"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:40
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:39
 msgid "Horizontal Line"
 msgstr "水平线"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:40
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:39
 msgid "Drag this to the layout to add a new horizontal line."
 msgstr "将它拖放到布局中来添加一个新的水平线。"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:42
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:41
 msgid "Vertical Line"
 msgstr "竖直线"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:42
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:41
 msgid "Drag this to the layout to add a new vertical line."
 msgstr "将它拖放到布局中来添加一个新的竖直线。"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:44
-#: ../glom/utility_widgets/layouttoolbar.cc:41
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:43
+#: ../glom/utility_widgets/layouttoolbar.cc:40
 msgid "Related Records"
 msgstr "相关记录"
 
-#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:44
+#: ../glom/mode_design/print_layouts/print_layout_toolbar.cc:43
 msgid "Drag this to the layout to add a new related records portal."
 msgstr "将它拖放到布局中来添加一个新的相关记录入口。"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:229
-msgid "Unselect All"
-msgstr "全部不选"
+#. Ask for confirmation:
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:837
+msgid "Create Standard Layout"
+msgstr "创建标准布局"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:232
-msgid "_Insert"
-msgstr "插入(_I)"
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:838
+msgid ""
+"This is an experimental feature. It will remove all items from the print "
+"layout and then try to create a layout similar to the layout of the detail "
+"view."
+msgstr ""
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:233
-msgid "Insert _Field"
-msgstr "插入字段(_F)"
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:841
+#: ../glom/mode_design/users/dialog_groups_list.cc:82
+msgid "Create"
+msgstr "创建"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:235
-msgid "Insert _Text"
-msgstr "插入文本(_T)"
+#. Ask the user to confirm:
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:881
+msgid "Remove page"
+msgstr "删除页面"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:237
-msgid "Insert _Image"
-msgstr "插入图像(_I)"
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:882
+#, fuzzy
+#| msgid "Are you sure that you want to rename this print layout?"
+msgid ""
+"Are you sure that you wish to remove the last page and any items on that "
+"page?"
+msgstr "您确定要重命名此打印布局吗?"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:239
-msgid "Insert _Related Records"
-msgstr "插入相关记录(_R)"
+#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:885
+msgid "Remove Page"
+msgstr "删除页面"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:241
-msgid "Insert _Horizontal Line"
-msgstr "插入水平线(_H)"
+#: ../glom/mode_design/script_library/dialog_script_library.cc:124
+msgid "Remove library script"
+msgstr "移除库脚本"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:243
-msgid "Insert _Vertical Line"
-msgstr "插入竖直线(_V)"
+#: ../glom/mode_design/script_library/dialog_script_library.cc:125
+msgid ""
+"Do you really want to delete this script? This data can not be recovered"
+msgstr "您真的想删除此脚本?这项数据将无法恢复。"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:245
-msgid "_Create Standard Layout"
-msgstr "创建标准布局(_C)"
+#: ../glom/mode_design/script_library/dialog_script_library.cc:127
+#: ../data/ui/developer/dialog_script_library.glade.h:7
+#: ../data/ui/developer/window_users.glade.h:8
+#, fuzzy
+#| msgid "Remove page"
+msgid "_Remove"
+msgstr "删除页面"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:247
-msgid "_Add Page"
-msgstr "添加页面(_A)"
+#: ../glom/mode_design/users/dialog_groups_list.cc:76
+msgid "View"
+msgstr "查看"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:249
-msgid "_Delete Page"
-msgstr "删除页面(_D)"
+#. TODO: Prevent deletion of standard groups
+#: ../glom/mode_design/users/dialog_groups_list.cc:212
+msgid "Delete Group"
+msgstr "删除组"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:253
-msgid "_Align"
-msgstr "对齐(_A)"
+#: ../glom/mode_design/users/dialog_groups_list.cc:213
+msgid "Are your sure that you wish to delete this group?"
+msgstr "您确定要删除这个组吗?"
 
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:255
-msgid "Align _Top"
-msgstr "上对齐(_T)"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:259
-msgid "Align _Bottom"
-msgstr "下对齐(_B)"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:263
-msgid "Align _Left"
-msgstr "左对齐(_L)"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:267
-msgid "Align _Right"
-msgstr "右对齐(_R)"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:272
-#: ../glom/mode_design/relationships_overview/dialog_relationships_overview.cc:64
-msgid "_View"
-msgstr "查看(_V)"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:273
-msgid "Show Grid"
-msgstr "显示网格"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:275
-msgid "Show Rules"
-msgstr "显示标尺"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:277
-msgid "Show Outlines"
-msgstr "显示大纲"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:281
-msgid "Fit Page _Width"
-msgstr "适合页宽(_W)"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:285
-msgid "Zoom 200%"
-msgstr "缩放 200%"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:293
-msgid "Zoom 50%"
-msgstr "缩放 50%"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:297
-msgid "Zoom 25%"
-msgstr "缩放 25%"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:755
-msgid "Insert"
-msgstr "插入"
-
-#. Ask for confirmation:
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:922
-msgid "Create Standard Layout"
-msgstr "创建标准布局"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:923
-msgid ""
-"This is an experimental feature. It will remove all items from the print "
-"layout and then try to create a layout similar to the layout of the detail "
-"view."
-msgstr ""
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:926
-#: ../glom/mode_design/users/dialog_groups_list.cc:81
-msgid "Create"
-msgstr "创建"
-
-#. Ask the user to confirm:
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:966
-msgid "Remove page"
-msgstr "删除页面"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:967
-#, fuzzy
-#| msgid "Are you sure that you want to rename this print layout?"
-msgid ""
-"Are you sure that you wish to remove the last page and any items on that "
-"page?"
-msgstr "您确定要重命名此打印布局吗?"
-
-#: ../glom/mode_design/print_layouts/window_print_layout_edit.cc:970
-msgid "Remove Page"
-msgstr "删除页面"
-
-#: ../glom/mode_design/relationships_overview/dialog_relationships_overview.cc:59
-msgid "Page _Setup"
-msgstr "页面设置(_S)"
-
-#: ../glom/mode_design/relationships_overview/dialog_relationships_overview.cc:65
-msgid "Show _Grid"
-msgstr "显示网格(_G)"
-
-#: ../glom/mode_design/relationships_overview/dialog_relationships_overview.cc:475
-msgid "Edit _Fields"
-msgstr "编辑字段(_F)"
-
-#: ../glom/mode_design/relationships_overview/dialog_relationships_overview.cc:478
-msgid "Edit _Relationships"
-msgstr "编辑关系(_R)"
-
-#: ../glom/mode_design/script_library/dialog_script_library.cc:130
-msgid "Remove library script"
-msgstr "移除库脚本"
-
-#: ../glom/mode_design/script_library/dialog_script_library.cc:131
-msgid ""
-"Do you really want to delete this script? This data can not be recovered"
-msgstr "您真的想删除此脚本?这项数据将无法恢复。"
-
-#: ../glom/mode_design/users/dialog_groups_list.cc:75
-msgid "View"
-msgstr "查看"
-
-#: ../glom/mode_design/users/dialog_groups_list.cc:78
-msgid "Edit"
-msgstr "编辑"
-
-#: ../glom/mode_design/users/dialog_groups_list.cc:84
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:47
-#: ../glom/utility_widgets/layoutwidgetutils.cc:37
-#: ../glom/utility_widgets/notebooklabelglom.cc:116
-msgid "Delete"
-msgstr "删除"
-
-#. TODO: Prevent deletion of standard groups
-#: ../glom/mode_design/users/dialog_groups_list.cc:217
-msgid "Delete Group"
-msgstr "删除组"
-
-#: ../glom/mode_design/users/dialog_groups_list.cc:218
-msgid "Are your sure that you wish to delete this group?"
-msgstr "您确定要删除这个组吗?"
-
-#: ../glom/mode_design/users/dialog_groups_list.cc:372
-msgid "Full access."
-msgstr "完全访问权限。"
+#: ../glom/mode_design/users/dialog_groups_list.cc:354
+msgid "Full access."
+msgstr "完全访问权限。"
 
 #. Append the View columns:
 #: ../glom/mode_design/users/dialog_users_list.cc:66
@@ -2627,42 +2716,62 @@ msgctxt "Users List"
 msgid "User"
 msgstr "用户"
 
-#: ../glom/mode_design/users/dialog_users_list.cc:161
+#: ../glom/mode_design/users/dialog_users_list.cc:157
 msgid "Delete User"
 msgstr "删除用户"
 
-#: ../glom/mode_design/users/dialog_users_list.cc:162
+#: ../glom/mode_design/users/dialog_users_list.cc:158
 msgid "Are your sure that you wish to delete this user?"
 msgstr "您确定要删除此用户吗?"
 
-#: ../glom/mode_design/users/dialog_users_list.cc:404
+#: ../glom/mode_design/users/dialog_users_list.cc:183
+msgid "Error Retrieving the List of Users"
+msgstr ""
+
+#: ../glom/mode_design/users/dialog_users_list.cc:184
+msgid ""
+"Glom could not get the list of users from the database server. You probably "
+"do not have enough permissions. You should be a superuser."
+msgstr ""
+
+#: ../glom/mode_design/users/dialog_users_list.cc:411
 msgid "Developer group may not be empty."
 msgstr "开发者组不能是空组。"
 
-#: ../glom/mode_design/users/dialog_users_list.cc:405
+#: ../glom/mode_design/users/dialog_users_list.cc:412
 msgid "The developer group must contain at least one user."
 msgstr "开发者组必须至少含有一位用户。"
 
 #. Prevent two tables with the same name from being added.
-#: ../glom/navigation/box_tables.cc:134
+#: ../glom/navigation/box_tables.cc:129
 msgid "This table already exists. Please choose a different table name"
 msgstr "此表已存在。请另选一个表名。"
 
-#: ../glom/navigation/box_tables.cc:136
+#: ../glom/navigation/box_tables.cc:131
 msgid "Hidden"
 msgstr "隐藏"
 
 #. TODO: This should really be a radio, but the use of AddDel makes it awkward to change that CellRenderer 
property.
-#: ../glom/navigation/box_tables.cc:140
+#: ../glom/navigation/box_tables.cc:135
 msgid "Default"
 msgstr "默认"
 
+#: ../glom/navigation/box_tables.cc:228
+msgid "Table Names Cannot Contain Spaces"
+msgstr ""
+
+#: ../glom/navigation/box_tables.cc:229
+msgid ""
+"Unfortunately, Glom tables cannot have names that contain spaces. Please "
+"enter a different name for the table."
+msgstr ""
+
 #. Ask the user if they want us to try to cope with this:
-#: ../glom/navigation/box_tables.cc:236
+#: ../glom/navigation/box_tables.cc:241
 msgid "Table Already Exists"
 msgstr "表已存在"
 
-#: ../glom/navigation/box_tables.cc:237
+#: ../glom/navigation/box_tables.cc:242
 msgid ""
 "This table already exists on the database server, though it is not mentioned "
 "in the .glom file. This should not happen. Would you like Glom to attempt to "
@@ -2672,14 +2781,14 @@ msgstr ""
 "让 Glom 尝试使用现有表吗?"
 
 #. TODO: Do not show tables that are not in the document.
-#: ../glom/navigation/box_tables.cc:297
+#: ../glom/navigation/box_tables.cc:302
 msgid ""
 "You cannot delete this table, because there is no information about this "
 "table in the document."
 msgstr "您不能删除这个表,因为文档中没有关于此表的信息。"
 
 #. Ask the user to confirm:
-#: ../glom/navigation/box_tables.cc:304
+#: ../glom/navigation/box_tables.cc:309
 #, fuzzy
 #| msgid ""
 #| "Are you sure that you want to delete this table?\n"
@@ -2691,35 +2800,36 @@ msgstr ""
 "您确定要删除这张表?\n"
 "表名:"
 
-#: ../glom/navigation/box_tables.cc:305
+#: ../glom/navigation/box_tables.cc:310 ../glom/navigation/box_tables.cc:316
 msgid "Delete Table"
 msgstr "删除表"
 
-#: ../glom/navigation/box_tables.cc:400
+#: ../glom/navigation/box_tables.cc:417
 msgid "Are you sure that you want to rename this table?"
 msgstr "您确定要重命名这张表?"
 
 #. TODO: Show old and new names?
-#: ../glom/navigation/box_tables.cc:401
+#: ../glom/navigation/box_tables.cc:418
 msgid "<b>Rename Table</b>"
 msgstr "<b>重命名表</b>"
 
-#: ../glom/navigation/box_tables.cc:443
+#: ../glom/navigation/box_tables.cc:459
 msgid "Unknown Table"
 msgstr "未知表"
 
-#: ../glom/navigation/box_tables.cc:444
+#: ../glom/navigation/box_tables.cc:460
 msgid ""
 "You cannot open this table, because there is no information about this table "
 "in the document."
 msgstr "您不能打开这张表,因为文档中没有关于此表的信息。"
 
-#: ../glom/print_layout/canvas_layout_item.cc:269
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:39
+#: ../glom/print_layout/canvas_layout_item.cc:230
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:112
 msgid "Choose Field"
 msgstr "选择字段"
 
-#: ../glom/print_layout/canvas_print_layout.cc:277
+#: ../glom/print_layout/canvas_print_layout.cc:287
+#: ../data/ui/developer/window_report_layout.glade.h:17
 msgid "_Formatting"
 msgstr "格式(_F)"
 
@@ -2738,38 +2848,38 @@ msgid "Item"
 msgstr "项目"
 
 #. Show the file-chooser dialog, to select an output .po file:
-#: ../glom/mode_design/translation/window_translations.cc:331
-#: ../glom/mode_design/translation/window_translations.cc:371
+#: ../glom/mode_design/translation/window_translations.cc:343
+#: ../glom/mode_design/translation/window_translations.cc:383
 msgid "Choose .po File Name"
 msgstr "选择 .po 文件名"
 
-#: ../glom/mode_design/translation/window_translations.cc:337
-#: ../glom/mode_design/translation/window_translations.cc:376
+#: ../glom/mode_design/translation/window_translations.cc:349
+#: ../glom/mode_design/translation/window_translations.cc:388
 msgid "Po files"
 msgstr "Po 文件"
 
-#: ../glom/mode_design/translation/window_translations.cc:342
-#: ../ui/developer/window_translations.glade.h:6
+#: ../glom/mode_design/translation/window_translations.cc:354
+#: ../data/ui/developer/window_translations.glade.h:7
 msgid "Export"
 msgstr "导出"
 
 #. Note to translators: "Import" here is an action verb - it's a button.
-#: ../glom/mode_design/translation/window_translations.cc:383
-#: ../ui/developer/window_translations.glade.h:8
+#: ../glom/mode_design/translation/window_translations.cc:395
+#: ../data/ui/developer/window_translations.glade.h:6
 msgid "Import"
 msgstr "导入"
 
-#: ../glom/utility_widgets/adddel/adddel.cc:157
+#: ../glom/utility_widgets/adddel/adddel.cc:121
 msgid "This item already exists. Please try again."
 msgstr "此项已存在。请重试。"
 
 #. Something more specific and helpful.
-#: ../glom/utility_widgets/adddel/adddel.cc:161
+#: ../glom/utility_widgets/adddel/adddel.cc:125
 msgid "Duplicate"
 msgstr "重复"
 
 #. Translators: This is just some example text used to discover an appropriate height for user-entered text 
in the UI. This text itself is never shown to the user.
-#: ../glom/mode_data/datawidget/combochoiceswithtreemodel.cc:468
+#: ../glom/mode_data/datawidget/combochoiceswithtreemodel.cc:449
 msgid "Example"
 msgstr "示例"
 
@@ -2799,6 +2909,13 @@ msgid ""
 "ID for this field."
 msgstr ""
 
+#: ../glom/mode_data/datawidget/datawidget.cc:238
+#: ../data/ui/operator/window_main.glade.h:4
+#: ../data/ui/developer/window_groups.glade.h:5
+#: ../data/ui/developer/window_users.glade.h:5
+msgid "_New"
+msgstr ""
+
 #: ../glom/mode_data/datawidget/datawidget.cc:239
 msgid ""
 "Enter details for a new record in the other table, then use its ID for this "
@@ -2810,63 +2927,66 @@ msgid "Table Content"
 msgstr "表内容"
 
 #. Translators: This is just some example text used to discover an appropriate height for user-entered text 
in the UI. This text itself is never shown to the user.
-#: ../glom/mode_data/db_adddel/db_adddel.cc:564
+#: ../glom/mode_data/db_adddel/db_adddel.cc:533
 #, fuzzy
 #| msgid "Example"
 msgid "ExampleEg"
 msgstr "示例"
 
-#: ../glom/mode_data/db_adddel/db_adddel.cc:2087
+#: ../glom/mode_data/db_adddel/db_adddel.cc:2003
 msgid "Right-click to layout, to specify the related fields."
 msgstr "在布局中右击来指定相关字段。"
 
 #. Tell user that they can't do that:
-#: ../glom/mode_data/db_adddel/db_adddel.cc:2304
+#: ../glom/mode_data/db_adddel/db_adddel.cc:2219
 #, fuzzy
 msgid "Extra Related Records Not Possible"
 msgstr "额外的相关记录不能用"
 
-#: ../glom/mode_data/db_adddel/db_adddel.cc:2305
+#: ../glom/mode_data/db_adddel/db_adddel.cc:2220
 msgid ""
 "You attempted to add a new related record, but there can only be one related "
 "record, because the relationship uses a unique key."
 msgstr ""
 "您尝试添加一个新的相关记录,但是只能有一个相关记录,因为该关系使用惟一的键。"
 
-#: ../glom/mode_data/datawidget/dialog_choose_id.cc:91
-#: ../glom/utility_widgets/imageglom.cc:770
-#: ../ui/developer/dialog_choose_relationship.glade.h:2
-#: ../ui/developer/dialog_field_summary.glade.h:4
-#: ../ui/developer/dialog_group_by.glade.h:7
+#: ../glom/mode_data/datawidget/dialog_choose_id.cc:87
+#: ../glom/utility_widgets/imageglom.cc:783
+#: ../data/ui/developer/dialog_field_summary.glade.h:5
+#: ../data/ui/developer/dialog_group_by.glade.h:6
 msgid "Select"
 msgstr "选择"
 
-#: ../glom/utility_widgets/dialog_image_load_progress.cc:105
+#: ../glom/mode_data/datawidget/dialog_choose_id.cc:104
+msgid "You have not entered any quick find criteria."
+msgstr ""
+
+#: ../glom/utility_widgets/dialog_image_load_progress.cc:108
 msgid "Not enough memory available to load the image"
 msgstr "没有足够的内存来载入此图像"
 
-#: ../glom/utility_widgets/dialog_image_load_progress.cc:157
+#: ../glom/utility_widgets/dialog_image_load_progress.cc:160
 msgid "Error loading %1"
 msgstr "载入 %1 出错"
 
-#: ../glom/utility_widgets/dialog_image_load_progress.cc:158
+#: ../glom/utility_widgets/dialog_image_load_progress.cc:161
 msgid "Error loading image"
 msgstr "载入图像出错"
 
-#: ../glom/utility_widgets/dialog_image_save_progress.cc:135
+#: ../glom/utility_widgets/dialog_image_save_progress.cc:133
 msgid "Error Saving"
 msgstr "保存时出错"
 
-#: ../glom/utility_widgets/dialog_image_save_progress.cc:136
+#: ../glom/utility_widgets/dialog_image_save_progress.cc:134
 msgid "Error saving image"
 msgstr "保存图像时出错"
 
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:82
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:64
 msgid "New Database"
 msgstr "新数据库"
 
 #. For instance, an extra hint when saving from an example, saying that a new file must be saved.
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:99
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:78
 msgid ""
 "Please choose a human-readable title for the new database. You can change "
 "this later in the database properties. It may contain any characters."
@@ -2874,144 +2994,251 @@ msgstr ""
 "请为新数据库选择一个好理解的标题。您可以稍后在数据库属性中修改它。标题中可以"
 "包含任何字符。"
 
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:105
-#: ../ui/developer/window_field_definition_edit.glade.h:14
-#: ../ui/developer/window_report_layout.glade.h:12
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:85
+#: ../data/ui/developer/window_field_definition_edit.glade.h:3
+#: ../data/ui/developer/window_report_layout.glade.h:7
 msgid "_Title:"
 msgstr "标题(_T):"
 
-#. Use titles that show the distinction between PostgreSQL and SQLite:
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:121
+#. Use titles that show the distinction between PostgreSQL and the alternatives:
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:100
 msgid ""
 "Create PostgreSQL database in its own folder, to be hosted by this computer."
 msgstr "在它自己的文件夹中创建 PostgreSQL 数据库,以此计算机为宿主机。"
 
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:125
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:101
 msgid ""
 "Create database on an external PostgreSQL database server, to be specified "
 "in the next step."
 msgstr "在外部 PostgreSQL 数据库服务器上创建数据库,服务器在下一步中指定。"
 
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:131
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:103
+msgid "Create database in its own folder, to be hosted by this computer."
+msgstr "在它自己的文件夹中创建数据库,以此计算机为宿主机。"
+
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:104
+msgid ""
+"Create database on an external database server, to be specified in the next "
+"step."
+msgstr "在外部数据库服务器上创建数据库,服务器在下一步中指定。"
+
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:121
 msgid ""
 "Create SQLite database in its own folder, to be hosted by this computer."
 msgstr "在它自己的文件夹中创建 SQLite 数据库,以此计算机为宿主机。"
 
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:132
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:122
 msgid ""
 "SQLite does not support authentication or remote access but is suitable for "
 "embedded devices."
 msgstr "SQLite 不支持认证和远程访问,但适合嵌入式设备。"
 
-#. TODO: Hide this because it's the only radio button, so it's not a choice:
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:142
-msgid ""
-"Create database in its own folder, to be hosted by this computer, using "
-"SQLite"
-msgstr "在它自己的文件夹中创建数据库,以此计算机为宿主机,使用 SQLite"
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:129
+#, fuzzy
+#| msgid ""
+#| "Create SQLite database in its own folder, to be hosted by this computer."
+msgid "Create MySQL database in its own folder, to be hosted by this computer."
+msgstr "在它自己的文件夹中创建 SQLite 数据库,以此计算机为宿主机。"
 
-#. Only PostgreSQL:
-#. Use titles that don't mention the boring name of the backend:
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:151
-msgid "Create database in its own folder, to be hosted by this computer."
-msgstr "在它自己的文件夹中创建数据库,以此计算机为宿主机。"
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:130
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:136
+msgid "MySQL support in Glom is experimental and unlikely to work properly."
+msgstr ""
 
-#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:155
+#: ../glom/utility_widgets/filechooserdialog_saveextras.cc:135
+#, fuzzy
+#| msgid ""
+#| "Create database on an external database server, to be specified in the "
+#| "next step."
 msgid ""
-"Create database on an external database server, to be specified in the next "
-"step."
+"Create database on an external MySQL database server, to be specified in the "
+"next step."
 msgstr "在外部数据库服务器上创建数据库,服务器在下一步中指定。"
 
-#: ../glom/utility_widgets/imageglom.cc:655
+#: ../glom/utility_widgets/imageglom.cc:668
 msgid "Images"
 msgstr "图像"
 
-#: ../glom/utility_widgets/imageglom.cc:676
+#: ../glom/utility_widgets/imageglom.cc:689
 msgid "Save Image"
 msgstr "保存图像"
 
-#: ../glom/utility_widgets/imageglom.cc:763
+#: ../glom/utility_widgets/imageglom.cc:776
+#: ../data/ui/developer/dialog_database_preferences.glade.h:15
 msgid "Choose Image"
 msgstr "选择图像"
 
-#: ../glom/utility_widgets/imageglom.cc:925
-msgid "Open With"
+#: ../glom/utility_widgets/imageglom.cc:968
+#, fuzzy
+#| msgid "Open Failed"
+msgid "_Open File"
+msgstr "打开失败"
+
+#: ../glom/utility_widgets/imageglom.cc:969
+#, fuzzy
+#| msgid "Open With"
+msgid "Open File With"
 msgstr "打开方式"
 
-#: ../glom/utility_widgets/imageglom.cc:927
-msgid "Choose File"
-msgstr "选择文件"
+#: ../glom/utility_widgets/imageglom.cc:971
+#: ../data/ui/operator/window_main.glade.h:15
+#: ../data/ui/developer/window_print_layout_edit.glade.h:6
+msgid "_Copy"
+msgstr ""
+
+#: ../glom/utility_widgets/imageglom.cc:972
+#: ../data/ui/operator/window_main.glade.h:16
+#: ../data/ui/developer/window_print_layout_edit.glade.h:7
+msgid "_Paste"
+msgstr ""
 
-#: ../glom/utility_widgets/layouttoolbar.cc:33
+#: ../glom/utility_widgets/imageglom.cc:973
+#: ../data/ui/operator/window_main.glade.h:17
+msgid "_Clear"
+msgstr ""
+
+#: ../glom/utility_widgets/layouttoolbar.cc:32
 msgid "Containers"
 msgstr "容器"
 
-#: ../glom/utility_widgets/layouttoolbar.cc:35
+#: ../glom/utility_widgets/layouttoolbar.cc:34
 msgid "Drag this to the layout to add a new group."
 msgstr "将它拖放到布局中来添加一个新组。"
 
-#: ../glom/utility_widgets/layouttoolbar.cc:37
+#: ../glom/utility_widgets/layouttoolbar.cc:36
 msgid "Drag this to the layout to add a new notebook."
 msgstr "将此项拖放到布局中来添加一个新的笔记本。"
 
-#: ../glom/utility_widgets/layouttoolbar.cc:41
+#: ../glom/utility_widgets/layouttoolbar.cc:40
 msgid "Drag this to the layout to add a new Related Record."
 msgstr "将它拖放到布局中来添加一个新的相关记录。"
 
-#: ../glom/utility_widgets/layouttoolbar.cc:43
+#: ../glom/utility_widgets/layouttoolbar.cc:42
 msgid "Drag this to the layout to add a new button."
 msgstr "将它拖放到布局中来添加一个新按钮。"
 
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:40
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:113
 msgid "Field Layout Properties"
 msgstr "字段布局属性"
 
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:41
-#: ../ui/developer/window_data_layout.glade.h:9
-msgid "Add Field"
-msgstr "添加字段"
-
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:42
-#: ../ui/developer/window_data_layout.glade.h:12
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:114
+#: ../data/ui/developer/window_data_layout.glade.h:19
 msgid "Add Related Records"
 msgstr "添加相关记录"
 
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:43
-#: ../ui/developer/window_data_layout.glade.h:10
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:115
+#: ../data/ui/developer/window_data_layout.glade.h:17
 msgid "Add Notebook"
 msgstr "添加笔记本"
 
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:44
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:116
+#: ../data/ui/developer/window_data_layout.glade.h:15
 msgid "Add Group"
 msgstr "添加组"
 
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:45
-#: ../ui/developer/window_data_layout.glade.h:8
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:117
+#: ../data/ui/developer/window_data_layout.glade.h:13
 msgid "Add Button"
 msgstr "添加按钮"
 
-#: ../glom/utility_widgets/layoutwidgetmenu.cc:46
-#: ../ui/developer/window_data_layout.glade.h:13
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:118
+#: ../data/ui/developer/window_data_layout.glade.h:9
 msgid "Add Text"
 msgstr "添加文本"
 
-#: ../glom/utility_widgets/layoutwidgetutils.cc:36
+#: ../glom/utility_widgets/layoutwidgetmenu.cc:119
+msgid "Delete"
+msgstr "删除"
+
+#: ../glom/utility_widgets/layoutwidgetutils.cc:52
 msgid "Properties"
 msgstr "属性"
 
-#: ../glom/utility_widgets/notebooklabelglom.cc:89
+#: ../glom/utility_widgets/notebooklabelglom.cc:85
 msgid "Delete whole notebook \"%1\"?"
 msgstr "删除整个笔记本“%1”吗?"
 
-#: ../glom/utility_widgets/notebooklabelglom.cc:94
+#: ../glom/utility_widgets/notebooklabelglom.cc:90
 msgid "Delete whole notebook?"
 msgstr "删除整个笔记本?"
 
-#: ../ui/operator/box_navigation_tables.glade.h:2
+#: ../data/ui/operator/box_navigation_tables.glade.h:2
 msgid "_Show hidden tables"
 msgstr "显示隐藏表(_S)"
 
-#: ../ui/operator/dialog_choose_date.glade.h:1
+#: ../data/ui/operator/box_navigation_tables.glade.h:3
+#: ../data/ui/operator/dialog_new_record.glade.h:2
+#: ../data/ui/operator/window_main.glade.h:12
+#: ../data/ui/developer/window_data_layout_export.glade.h:8
+#: ../data/ui/developer/window_data_layout.glade.h:34
+#: ../data/ui/developer/window_design.glade.h:4
+#: ../data/ui/developer/window_groups.glade.h:3
+#: ../data/ui/developer/window_print_layout_edit.glade.h:47
+#: ../data/ui/developer/box_print_layouts.glade.h:2
+#: ../data/ui/developer/window_relationships_overview.glade.h:9
+#: ../data/ui/developer/window_report_layout.glade.h:20
+#: ../data/ui/developer/box_reports.glade.h:2
+#: ../data/ui/developer/window_text_format.glade.h:2
+#: ../data/ui/developer/window_users.glade.h:3
+msgid "_Close"
+msgstr ""
+
+#: ../data/ui/operator/dialog_choose_date.glade.h:1
+msgid "Choose Date"
+msgstr "选择日期"
+
+#: ../data/ui/operator/dialog_choose_date.glade.h:2
+#: ../data/ui/operator/dialog_connection.glade.h:2
+#: ../data/ui/operator/dialog_data_invalid_format.glade.h:1
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:2
+#: ../data/ui/operator/dialog_import_csv.glade.h:4
+#: ../data/ui/operator/window_main.glade.h:42
+#: ../data/ui/developer/dialog_change_language.glade.h:2
+#: ../data/ui/developer/dialog_choose_user.glade.h:2
+#: ../data/ui/developer/dialog_database_preferences.glade.h:2
+#: ../data/ui/developer/dialog_fieldslist.glade.h:1
+#: ../data/ui/developer/dialog_initial_password.glade.h:2
+#: ../data/ui/developer/dialog_line.glade.h:2
+#: ../data/ui/developer/dialog_new_group.glade.h:2
+#: ../data/ui/developer/dialog_new_library_script.glade.h:2
+#: ../data/ui/developer/dialog_notebook.glade.h:2
+#: ../data/ui/developer/dialog_script_library.glade.h:2
+#: ../data/ui/developer/dialog_sort_fields.glade.h:2
+#: ../data/ui/developer/dialog_translation_copy.glade.h:2
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:2
+#: ../data/ui/developer/dialog_user.glade.h:2
+#: ../data/ui/developer/window_button_script.glade.h:2
+#: ../data/ui/developer/window_field_calculation.glade.h:2
+#: ../data/ui/developer/window_groups.glade.h:2
+#: ../data/ui/developer/window_imageobject.glade.h:2
+#: ../data/ui/developer/window_textobject.glade.h:2
+#: ../data/ui/developer/window_users.glade.h:2
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../data/ui/operator/dialog_choose_date.glade.h:4
+#: ../data/ui/operator/dialog_data_invalid_format.glade.h:3
+#: ../data/ui/operator/dialog_import_csv_progress.glade.h:4
+#: ../data/ui/developer/dialog_database_preferences.glade.h:4
+#: ../data/ui/developer/dialog_fieldslist.glade.h:3
+#: ../data/ui/developer/dialog_field_summary.glade.h:3
+#: ../data/ui/developer/dialog_flowtable.glade.h:3
+#: ../data/ui/developer/dialog_group_by.glade.h:3
+#: ../data/ui/developer/dialog_line.glade.h:4
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:3
+#: ../data/ui/developer/dialog_notebook.glade.h:4
+#: ../data/ui/developer/dialog_script_library.glade.h:3
+#: ../data/ui/developer/dialog_sort_fields.glade.h:4
+#: ../data/ui/developer/dialog_user.glade.h:4
+#: ../data/ui/developer/window_button_script.glade.h:4
+#: ../data/ui/developer/window_field_calculation.glade.h:4
+#: ../data/ui/developer/window_imageobject.glade.h:4
+#: ../data/ui/developer/window_textobject.glade.h:4
+#: ../data/ui/developer/window_translations.glade.h:11
+msgid "_OK"
+msgstr ""
+
+#: ../data/ui/operator/dialog_choose_date.glade.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Choose Date</span>\n"
 "\n"
@@ -3021,57 +3248,64 @@ msgstr ""
 "\n"
 "请选择要填入该字段的日期。。"
 
-#: ../ui/operator/dialog_choose_date.glade.h:4
-msgid "Choose Date"
-msgstr "选择日期"
-
-#: ../ui/operator/dialog_connection.glade.h:1
+#: ../data/ui/operator/dialog_connection.glade.h:1
 msgid "Connect to Server"
 msgstr "连接到服务器"
 
-#: ../ui/operator/dialog_connection.glade.h:2
-msgid "Database"
-msgstr "数据库"
+#: ../data/ui/operator/dialog_connection.glade.h:4
+msgid "C_onnect"
+msgstr ""
 
-#: ../ui/operator/dialog_connection.glade.h:3
-msgid "Database:"
-msgstr "数据库:"
+#: ../data/ui/operator/dialog_connection.glade.h:5
+msgid "Please enter the connection details for your database server."
+msgstr "请输入您数据库服务器的连接细节。"
 
-#: ../ui/operator/dialog_connection.glade.h:4
+#: ../data/ui/operator/dialog_connection.glade.h:6
 msgid "Host"
 msgstr "主机"
 
-#: ../ui/operator/dialog_connection.glade.h:5
-msgid "Password"
-msgstr "密码"
-
-#: ../ui/operator/dialog_connection.glade.h:6
-msgid "Please enter the connection details for your database server."
-msgstr "请输入您数据库服务器的连接细节。"
-
-#: ../ui/operator/dialog_connection.glade.h:7
-#: ../ui/developer/dialog_choose_user.glade.h:5
-#: ../ui/developer/dialog_user.glade.h:5
+#: ../data/ui/operator/dialog_connection.glade.h:8
+#: ../data/ui/developer/dialog_choose_user.glade.h:8
+#: ../data/ui/developer/dialog_user.glade.h:1
 msgid "User"
 msgstr "用户"
 
-#: ../ui/operator/dialog_connection.glade.h:8
+#: ../data/ui/operator/dialog_connection.glade.h:9
 msgid "_Host:"
 msgstr "主机(_H):"
 
-#: ../ui/operator/dialog_connection.glade.h:9
-#: ../ui/developer/dialog_initial_password.glade.h:5
-msgid "_Password:"
-msgstr "密码(_N):"
+#: ../data/ui/operator/dialog_connection.glade.h:10
+msgid "Database:"
+msgstr "数据库:"
 
-#: ../ui/operator/dialog_connection.glade.h:10
-#: ../ui/developer/dialog_initial_password.glade.h:6
+#: ../data/ui/operator/dialog_connection.glade.h:11
+#: ../data/ui/developer/dialog_initial_password.glade.h:6
 msgid "_User:"
 msgstr "用户(_U):"
 
-#: ../ui/operator/dialog_data_invalid_format.glade.h:1
+#: ../data/ui/operator/dialog_connection.glade.h:12
+#: ../data/ui/developer/dialog_initial_password.glade.h:7
+msgid "_Password:"
+msgstr "密码(_N):"
+
+#: ../data/ui/operator/dialog_connection.glade.h:13
+msgid "Database"
+msgstr "数据库"
+
+#: ../data/ui/operator/dialog_data_invalid_format.glade.h:2
+msgid "_Revert"
+msgstr ""
+
+#: ../data/ui/operator/dialog_data_invalid_format.glade.h:4
+#, fuzzy
+#| msgid ""
+#| "<span weight=\"bold\" size=\"larger\">Invalid format</span>\n"
+#| "\n"
+#| "The data in the field was not recognized. Please try to correct the data "
+#| "or revert to the previous value. Here is an example of correctly-"
+#| "formatted data for this field.\n"
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Invalid format</span>\n"
+"<span weight=\"bold\" size=\"larger\">Invalid Format</span>\n"
 "\n"
 "The data in the field was not recognized. Please try to correct the data or "
 "revert to the previous value. Here is an example of correctly-formatted data "
@@ -3082,137 +3316,316 @@ msgstr ""
 "不能识别字段中的数据。请更正数据或还原成先前的值。这有一个该字段正确格式数据"
 "的例子。\n"
 
-#: ../ui/operator/dialog_data_invalid_format.glade.h:5
+#: ../data/ui/operator/dialog_data_invalid_format.glade.h:8
 msgid "example data format"
 msgstr "示例数据格式"
 
-#: ../ui/operator/dialog_existing_or_new.glade.h:1
-msgid "<span weight=\"bold\" size=\"larger\">Open or create a Document</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">打开或创建文档</span>"
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:1
+msgid "Welcome to Glom"
+msgstr "欢迎使用 Glom"
 
-#: ../ui/operator/dialog_existing_or_new.glade.h:2
-msgid "Create New Document"
-msgstr "创建新文档"
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:3
+msgid "_Quit"
+msgstr ""
 
-#: ../ui/operator/dialog_existing_or_new.glade.h:3
-msgid "Open Existing Document"
-msgstr "打开现有文档"
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:4
+#: ../data/ui/developer/dialog_choose_field.glade.h:3
+#: ../data/ui/developer/dialog_choose_relationship.glade.h:3
+msgid "_Select"
+msgstr "选择(_S)"
 
-#: ../ui/operator/dialog_existing_or_new.glade.h:4
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:5
+#, fuzzy
+#| msgid ""
+#| "<span weight=\"bold\" size=\"larger\">Open or create a Document</span>"
+msgid "<span weight=\"bold\" size=\"larger\">Open or Create a Document</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">打开或创建文档</span>"
+
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:6
 msgid "Open or create Document"
 msgstr "打开或创建文档"
 
-#: ../ui/operator/dialog_existing_or_new.glade.h:5
-msgid "Welcome to Glom"
-msgstr "欢迎使用 Glom"
-
-#: ../ui/operator/dialog_existing_or_new.glade.h:6
-#: ../ui/developer/dialog_choose_field.glade.h:3
-msgid "_Select"
-msgstr "选择(_S)"
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:7
+msgid "Open Existing Document"
+msgstr "打开现有文档"
 
-#: ../ui/operator/dialog_find_id.glade.h:1
-#: ../ui/operator/dialog_new_record.glade.h:1
-#: ../ui/developer/window_data_layout_export.glade.h:1
-#: ../ui/developer/window_data_layout.glade.h:6
-#: ../ui/developer/window_design.glade.h:1
-#: ../ui/developer/window_report_layout.glade.h:3
-msgid "<b>Table:</b>"
-msgstr "<b>表:</b>"
+#: ../data/ui/operator/dialog_existing_or_new.glade.h:8
+msgid "Create New Document"
+msgstr "创建新文档"
 
-#: ../ui/operator/dialog_find_id.glade.h:2
-#: ../ui/operator/dialog_new_record.glade.h:2
+#: ../data/ui/operator/dialog_find_id.glade.h:1
 msgid "Find Related Record"
 msgstr "查找相关记录"
 
-#: ../ui/operator/dialog_find_id.glade.h:4
-#: ../ui/operator/dialog_new_record.glade.h:3
+#: ../data/ui/operator/dialog_find_id.glade.h:3
+#: ../data/ui/operator/dialog_new_record.glade.h:3
+#: ../data/ui/developer/window_data_layout_export.glade.h:2
+#: ../data/ui/developer/window_data_layout.glade.h:2
+#: ../data/ui/developer/window_design.glade.h:2
+#: ../data/ui/developer/window_report_layout.glade.h:2
+msgid "<b>Table:</b>"
+msgstr "<b>表:</b>"
+
+#: ../data/ui/operator/dialog_find_id.glade.h:4
+#: ../data/ui/operator/dialog_new_record.glade.h:4
 msgid "table_name"
 msgstr "表名(_N)"
 
-#: ../ui/operator/dialog_image_load_progress.glade.h:1
+#: ../data/ui/operator/dialog_new_record.glade.h:1
+#, fuzzy
+#| msgid "Related Records"
+msgid "New Related Record"
+msgstr "相关记录"
+
+#: ../data/ui/operator/dialog_image_load_progress.glade.h:1
 msgid "Loading image"
 msgstr "正在载入图像"
 
-#: ../ui/operator/dialog_image_save_progress.glade.h:1
+#: ../data/ui/operator/dialog_image_save_progress.glade.h:1
 msgid "Saving Image"
 msgstr "正在保存图像"
 
-#. Import is a noun here. This is the title for a list of fields to import.
-#: ../ui/operator/dialog_import_csv.glade.h:2
-msgid "<b>Import Fields</b>"
-msgstr "<b>导入字段</b>"
+#: ../data/ui/operator/dialog_import_csv.glade.h:1
+msgid "bla.blub - Import from CSV"
+msgstr "bla.blub - 从 CSV 导入"
 
-#. Import is a noun here. This is the title for a window showing options for an import operation.
-#: ../ui/operator/dialog_import_csv.glade.h:4
-msgid "<b>Import Options</b>"
-msgstr "<b>导入选项</b>"
+#: ../data/ui/operator/dialog_import_csv.glade.h:3
+#: ../data/ui/operator/window_main.glade.h:8
+msgid "I_mport"
+msgstr "导入(_M)"
 
-#: ../ui/operator/dialog_import_csv.glade.h:5
-msgid "Encoding detected as: UTF-8"
-msgstr "检测到的编码为:UTF-8"
+#: ../data/ui/operator/dialog_import_csv.glade.h:5
+#: ../data/ui/developer/box_formatting.glade.h:23
+msgid "label"
+msgstr "标签"
 
-#: ../ui/operator/dialog_import_csv.glade.h:7
-msgid "Import Into _Table:"
-msgstr "导入表(_T):"
+#: ../data/ui/operator/dialog_import_csv.glade.h:6
+msgid "_First line as title"
+msgstr "首行作为标题(_F)"
 
-#: ../ui/operator/dialog_import_csv.glade.h:8
+#: ../data/ui/operator/dialog_import_csv.glade.h:7
 msgid "_Encoding:"
 msgstr "编码(_E):"
 
-#: ../ui/operator/dialog_import_csv.glade.h:9
-msgid "_First line as title"
-msgstr "首行作为标题(_F)"
+#: ../data/ui/operator/dialog_import_csv.glade.h:8
+msgid "Import Into _Table:"
+msgstr "导入表(_T):"
+
+#: ../data/ui/operator/dialog_import_csv.glade.h:9
+msgid "Encoding detected as: UTF-8"
+msgstr "检测到的编码为:UTF-8"
+
+#. Import is a noun here. This is the title for a window showing options for an import operation.
+#: ../data/ui/operator/dialog_import_csv.glade.h:11
+msgid "<b>Import Options</b>"
+msgstr "<b>导入选项</b>"
 
-#: ../ui/operator/dialog_import_csv.glade.h:10
+#: ../data/ui/operator/dialog_import_csv.glade.h:12
 msgid "_Number of sample rows:"
 msgstr "示例行的数量(_N):"
 
-#: ../ui/operator/dialog_import_csv.glade.h:11
-msgid "bla.blub - Import from CSV"
-msgstr "bla.blub - 从 CSV 导入"
-
-#: ../ui/operator/dialog_import_csv.glade.h:12
-#: ../ui/developer/box_formatting.glade.h:31
-msgid "label"
-msgstr "标签"
+#: ../data/ui/operator/dialog_import_csv.glade.h:13
+msgid "0"
+msgstr ""
+
+#. Import is a noun here. This is the title for a list of fields to import.
+#: ../data/ui/operator/dialog_import_csv.glade.h:15
+msgid "<b>Import Fields</b>"
+msgstr "<b>导入字段</b>"
 
 #. This is a status message for a progress dialog. It says that importing is currently happenning.
-#: ../ui/operator/dialog_import_csv_progress.glade.h:2
+#: ../data/ui/operator/dialog_import_csv_progress.glade.h:2
 msgid "Importing Data"
 msgstr "正在导入数据"
 
-#: ../ui/operator/dialog_import_csv_progress.glade.h:3
+#: ../data/ui/operator/dialog_import_csv_progress.glade.h:5
 msgid "Please wait while your data is imported."
 msgstr "请稍候,正在导入您的数据。"
 
-#: ../ui/developer/dialog_add_related_table.glade.h:1
+#: ../data/ui/operator/window_main.glade.h:3
+#: ../data/ui/developer/window_print_layout_edit.glade.h:1
+#: ../data/ui/developer/window_relationships_overview.glade.h:1
+msgid "_File"
+msgstr "文件(_F)"
+
+#: ../data/ui/operator/window_main.glade.h:6
+msgid "_Save as Example"
+msgstr "保存为示例(_S)"
+
+#: ../data/ui/operator/window_main.glade.h:9
+msgid "S_hared on Network"
+msgstr "在网络上共享(_H)"
+
+#: ../data/ui/operator/window_main.glade.h:10
+#: ../data/ui/developer/window_relationships_overview.glade.h:3
+#, fuzzy
+#| msgid "_Print Layouts"
+msgid "_Print"
+msgstr "打印布局(_P)"
+
+#: ../data/ui/operator/window_main.glade.h:11
+msgid "_Edit Print Layouts"
+msgstr "编辑打印布局(_E)"
+
+#: ../data/ui/operator/window_main.glade.h:14
+#: ../data/ui/developer/window_print_layout_edit.glade.h:5
+msgid "Cu_t"
+msgstr ""
+
+#: ../data/ui/operator/window_main.glade.h:19
+msgid "_Tables"
+msgstr "表(_T)"
+
+#: ../data/ui/operator/window_main.glade.h:20
+msgid "_Edit Tables"
+msgstr "编辑表(_E)"
+
+#: ../data/ui/operator/window_main.glade.h:21
+msgid "R_eports"
+msgstr "报表(_E)"
+
+#: ../data/ui/operator/window_main.glade.h:22
+msgid "_Edit Reports"
+msgstr "编辑报表(_E)"
+
+#: ../data/ui/operator/window_main.glade.h:23
+#, fuzzy
+#| msgctxt "Developer menu title"
+#| msgid "_Developer"
+msgid "_Developer"
+msgstr "开发者(_D)"
+
+#: ../data/ui/operator/window_main.glade.h:24
+#, fuzzy
+#| msgid "_Operator Mode"
+msgid "_Operator"
+msgstr "操作员模式(_O)"
+
+#: ../data/ui/operator/window_main.glade.h:25
+msgid "_Fields"
+msgstr "字段(_F)"
+
+#: ../data/ui/operator/window_main.glade.h:26
+#, fuzzy
+#| msgid "_Relationship:"
+msgid "_Relationships"
+msgstr "关系(_R):"
+
+#: ../data/ui/operator/window_main.glade.h:27
+msgid "Relationships _Overview"
+msgstr "关系概览(_O)"
+
+#: ../data/ui/operator/window_main.glade.h:29
+msgid "_Print Layouts"
+msgstr "打印布局(_P)"
+
+#: ../data/ui/operator/window_main.glade.h:30
+msgid "_Reports"
+msgstr "报表(_R)"
+
+#: ../data/ui/operator/window_main.glade.h:31
+msgid "_Database Preferences"
+msgstr "数据库首选项(_D)"
+
+#: ../data/ui/operator/window_main.glade.h:32
+msgid "_Users"
+msgstr "用户(_U)"
+
+#: ../data/ui/operator/window_main.glade.h:33
+msgid "Script _Library"
+msgstr "脚本库(_L)"
+
+#: ../data/ui/operator/window_main.glade.h:34
+msgid "_Translations"
+msgstr "翻译(_T)"
+
+#: ../data/ui/operator/window_main.glade.h:35
+msgid "Test Tra_nslation"
+msgstr "测试翻译(_N)"
+
+#: ../data/ui/operator/window_main.glade.h:36
+#, fuzzy
+#| msgid "_Active Platform"
+msgid "Active Platform"
+msgstr "活动平台(_A)"
+
+#: ../data/ui/operator/window_main.glade.h:37
+msgid "_Normal"
+msgstr "正常(_N)"
+
+#: ../data/ui/operator/window_main.glade.h:38
+msgid "_Maemo"
+msgstr "_Maemo"
+
+#: ../data/ui/operator/window_main.glade.h:39
+msgid "_Drag and Drop Layout"
+msgstr "拖放布局(_D)"
+
+#: ../data/ui/operator/window_main.glade.h:40
+msgid "_Export Backup"
+msgstr "导出备份(_E)"
+
+#: ../data/ui/operator/window_main.glade.h:41
+msgid "_Restore Backup"
+msgstr "恢复备份(_R)"
+
+#: ../data/ui/operator/window_main.glade.h:43
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../data/ui/operator/window_main.glade.h:44
+msgid "_Contents"
+msgstr "目录(_C)"
+
+#: ../data/ui/developer/dialog_add_related_table.glade.h:1
 msgid "Add Related Table"
 msgstr "添加相关表"
 
+#: ../data/ui/developer/dialog_add_related_table.glade.h:3
+#, fuzzy
+#| msgid "Delete Table"
+msgid "C_reate Table"
+msgstr "删除表"
+
+#: ../data/ui/developer/dialog_add_related_table.glade.h:4
+msgid ""
+"This will add a new table and add a relationship that refers to the new  "
+"table, as a convenient alternative to doing this in separate steps.\n"
+"\n"
+"If a suitable related table already exists then you should instead cancel "
+"and just add a relationship."
+msgstr ""
+
 #. Translators: FROM as in SQL's FROM
-#: ../ui/developer/dialog_add_related_table.glade.h:3
+#: ../data/ui/developer/dialog_add_related_table.glade.h:8
 msgid "From field:"
 msgstr "From 字段:"
 
-#: ../ui/developer/dialog_add_related_table.glade.h:4
+#: ../data/ui/developer/dialog_add_related_table.glade.h:9
+#, fuzzy
+#| msgid "Edit _Fields"
+msgid "_Edit Fields"
+msgstr "编辑字段(_F)"
+
+#: ../data/ui/developer/dialog_add_related_table.glade.h:10
 msgid "Name of new related table:"
 msgstr "新相关表的名称:"
 
-#: ../ui/developer/dialog_add_related_table.glade.h:5
+#: ../data/ui/developer/dialog_add_related_table.glade.h:11
 msgid "Name of new relationship:"
 msgstr "新关系名:"
 
-#: ../ui/developer/dialog_add_related_table.glade.h:6
-msgid ""
-"This will add a new table and add a relationship that refers to the new  "
-"table, as a convenient alternative to doing this in separate steps.\n"
-"\n"
-"If a suitable related table already exists then you should instead cancel "
-"and just add a relationship."
-msgstr ""
+#: ../data/ui/developer/dialog_change_language.glade.h:1
+msgid "Test Translation"
+msgstr "测试翻译"
+
+#: ../data/ui/developer/dialog_change_language.glade.h:4
+#, fuzzy
+#| msgid "Language:"
+msgid "Change Language"
+msgstr "语言:"
 
-#: ../ui/developer/dialog_change_language.glade.h:1
+#: ../data/ui/developer/dialog_change_language.glade.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Test Translation</span>\n"
 "\n"
@@ -3232,39 +3645,35 @@ msgstr ""
 "注意,Glom 的用户界面的标准部分如菜单和对话框窗口只有在使用该语言的计算机上启"
 "动时才会翻译。"
 
-#: ../ui/developer/dialog_change_language.glade.h:6
+#: ../data/ui/developer/dialog_change_language.glade.h:10
 msgid "Locale:"
 msgstr "区域:"
 
-#: ../ui/developer/dialog_change_language.glade.h:7
-msgid "Test Translation"
-msgstr "测试翻译"
-
-#: ../ui/developer/dialog_choose_field.glade.h:1
+#: ../data/ui/developer/dialog_choose_field.glade.h:1
 msgid "Select Field"
 msgstr "选择字段"
 
-#: ../ui/developer/dialog_choose_field.glade.h:2
+#: ../data/ui/developer/dialog_choose_field.glade.h:4
 msgid "Show _Related Relationships"
 msgstr "显示相关的关系(_R)"
 
-#: ../ui/developer/dialog_choose_field.glade.h:4
+#: ../data/ui/developer/dialog_choose_field.glade.h:5
 msgid "_Table:"
 msgstr "表(_T):"
 
-#: ../ui/developer/dialog_choose_relationship.glade.h:1
-msgid "<b>Select Relationship</b>"
-msgstr "<b>选择关系</b>"
-
-#: ../ui/developer/dialog_choose_relationship.glade.h:3
+#: ../data/ui/developer/dialog_choose_relationship.glade.h:1
 msgid "Select Relationship"
 msgstr "选择关系"
 
-#: ../ui/developer/dialog_choose_relationship.glade.h:4
+#: ../data/ui/developer/dialog_choose_relationship.glade.h:4
 msgid "Table:"
 msgstr "表:"
 
-#: ../ui/developer/dialog_choose_user.glade.h:1
+#: ../data/ui/developer/dialog_choose_user.glade.h:1
+msgid "Choose User"
+msgstr "选择用户"
+
+#: ../data/ui/developer/dialog_choose_user.glade.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Add User To Group</span>\n"
 "\n"
@@ -3274,152 +3683,149 @@ msgstr ""
 "\n"
 "将哪位用户添加到这个组?"
 
-#: ../ui/developer/dialog_choose_user.glade.h:4
-msgid "Choose User"
-msgstr "选择用户"
-
-#: ../ui/developer/dialog_database_preferences.glade.h:1
-msgid "<b>Address</b>"
-msgstr "<b>地址</b>"
-
-#: ../ui/developer/dialog_database_preferences.glade.h:2
-msgid "Auto-increment values"
-msgstr "自动增加值"
-
-#: ../ui/developer/dialog_database_preferences.glade.h:3
-msgid "Country:"
-msgstr "国家:"
-
-#: ../ui/developer/dialog_database_preferences.glade.h:4
+#: ../data/ui/developer/dialog_database_preferences.glade.h:1
 msgid "Database Preferences"
 msgstr "数据库首选项"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:5
-msgid "Logo"
-msgstr "徽标"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:5
+msgid "System Name:"
+msgstr "系统名称:"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:6
+#: ../data/ui/developer/dialog_database_preferences.glade.h:6
 msgid "Name:"
 msgstr "名称:"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:7
-msgid "Organisation"
-msgstr "组织"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:7
+msgid "Country:"
+msgstr "国家:"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:8
-msgid "Startup Script"
-msgstr "启动脚本"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:8
+msgid "Zip/Postal Code:"
+msgstr "邮政编码:"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:9
+#: ../data/ui/developer/dialog_database_preferences.glade.h:9
 msgid "State/County:"
 msgstr "州/县:"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:10
+#: ../data/ui/developer/dialog_database_preferences.glade.h:10
+msgid "Town:"
+msgstr "乡镇:"
+
+#: ../data/ui/developer/dialog_database_preferences.glade.h:11
 msgid "Street (Line 2):"
 msgstr "街道(行 2):"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:11
+#: ../data/ui/developer/dialog_database_preferences.glade.h:12
 msgid "Street:"
 msgstr "街道:"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:12
-msgid "System Name:"
-msgstr "系统名称:"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:13
+msgid "<b>Address</b>"
+msgstr "<b>地址</b>"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:13
-#: ../ui/developer/window_button_script.glade.h:3
-#: ../ui/developer/window_field_calculation.glade.h:2
-msgid "Test"
-msgstr "测试"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:14
+msgid "Organisation"
+msgstr "组织"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:14
-msgid "Town:"
-msgstr "乡镇:"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:16
+msgid "Logo"
+msgstr "徽标"
+
+#: ../data/ui/developer/dialog_database_preferences.glade.h:17
+msgid "Auto-increment values"
+msgstr "自动增加值"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:15
+#: ../data/ui/developer/dialog_database_preferences.glade.h:18
 msgid ""
 "When the database is opened the python function implemented here will run."
 msgstr "当打开数据库时,这里实现的 python 命令会执行。"
 
-#: ../ui/developer/dialog_database_preferences.glade.h:16
-msgid "Zip/Postal Code:"
-msgstr "邮政编码:"
-
-#: ../ui/developer/dialog_error_create_database.glade.h:1
-msgid ""
-"<span weight=\"bold\" size=\"larger\">Database creation failed</span>\n"
-"\n"
-"Glom could not create the new database. Maybe you do not have the necessary "
-"access rights. Please contact your system administrator."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">数据库创建失败</span>\n"
-"\n"
-"Glom 无法创建新数据库。或许您不具备访问权限。请联系您的系统管理员。"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:19
+#: ../data/ui/developer/window_button_script.glade.h:7
+#: ../data/ui/developer/window_field_calculation.glade.h:6
+msgid "Test"
+msgstr "测试"
 
-#: ../ui/developer/dialog_fieldslist.glade.h:1
-#: ../ui/developer/window_data_layout.glade.h:2
-msgid "<b>Fields</b>"
-msgstr "<b>字段</b>"
+#: ../data/ui/developer/dialog_database_preferences.glade.h:20
+msgid "Startup Script"
+msgstr "启动脚本"
 
-#: ../ui/developer/dialog_fieldslist.glade.h:3
-#: ../ui/developer/dialog_sort_fields.glade.h:3
+#: ../data/ui/developer/dialog_fieldslist.glade.h:4
+#: ../data/ui/developer/dialog_sort_fields.glade.h:5
 msgid "Table: "
 msgstr "表:"
 
-#: ../ui/developer/dialog_field_summary.glade.h:1
-msgid "<b>Summary Field</b>"
-msgstr "<b>汇总字段</b>"
+#: ../data/ui/developer/dialog_fieldslist.glade.h:5
+#: ../data/ui/developer/dialog_notebook.glade.h:5
+#: ../data/ui/developer/dialog_sort_fields.glade.h:6
+#: ../data/ui/developer/window_data_layout_export.glade.h:3
+#: ../data/ui/developer/window_data_layout.glade.h:23
+#: ../data/ui/developer/window_report_layout.glade.h:14
+msgid "_Up"
+msgstr ""
+
+#: ../data/ui/developer/dialog_fieldslist.glade.h:6
+#: ../data/ui/developer/dialog_notebook.glade.h:6
+#: ../data/ui/developer/dialog_sort_fields.glade.h:7
+#: ../data/ui/developer/window_data_layout_export.glade.h:4
+#: ../data/ui/developer/window_data_layout.glade.h:24
+#: ../data/ui/developer/window_report_layout.glade.h:15
+msgid "_Down"
+msgstr ""
+
+#: ../data/ui/developer/dialog_fieldslist.glade.h:11
+#: ../data/ui/developer/window_data_layout.glade.h:29
+msgid "<b>Fields</b>"
+msgstr "<b>字段</b>"
 
-#: ../ui/developer/dialog_field_summary.glade.h:3
-#: ../ui/developer/dialog_group_by.glade.h:3
-#: ../ui/developer/box_formatting.glade.h:16
+#: ../data/ui/developer/dialog_field_summary.glade.h:4
+#: ../data/ui/developer/dialog_group_by.glade.h:4
+#: ../data/ui/developer/box_formatting.glade.h:21
 msgid "Field:"
 msgstr "字段:"
 
-#: ../ui/developer/dialog_field_summary.glade.h:5
+#: ../data/ui/developer/dialog_field_summary.glade.h:6
 msgid "Summary Type:"
 msgstr "汇总类型:"
 
-#: ../ui/developer/dialog_flowtable.glade.h:1
-msgid "Columns:"
-msgstr "列:"
-
-#: ../ui/developer/dialog_flowtable.glade.h:2
+#: ../data/ui/developer/dialog_flowtable.glade.h:1
 msgid "Group Properties"
 msgstr "组属性"
 
-#: ../ui/developer/dialog_flowtable.glade.h:3
-#: ../ui/developer/window_print_layout_edit.glade.h:5
+#: ../data/ui/developer/dialog_flowtable.glade.h:4
+msgid "Columns:"
+msgstr "列:"
+
+#: ../data/ui/developer/dialog_flowtable.glade.h:5
+#: ../data/ui/developer/window_print_layout_edit.glade.h:42
 msgid "Title:"
 msgstr "标题:"
 
-#: ../ui/developer/dialog_group_by.glade.h:1
-msgid "<b>Group By</b>"
-msgstr "<b>分组依据</b>"
-
-#: ../ui/developer/dialog_group_by.glade.h:2
-msgid "Border Width (ems)"
-msgstr "边框宽度(单位 em)"
+#: ../data/ui/developer/dialog_group_by.glade.h:7
+msgid "Sort Fields:"
+msgstr "排序字段:"
 
-#: ../ui/developer/dialog_group_by.glade.h:6
+#: ../data/ui/developer/dialog_group_by.glade.h:9
 msgid "Secondary Fields:"
 msgstr "次要字段:"
 
-#: ../ui/developer/dialog_group_by.glade.h:8
-msgid "Sort Fields:"
-msgstr "排序字段:"
-
-#: ../ui/developer/dialog_initial_password.glade.h:1
-#: ../ui/developer/dialog_new_group.glade.h:4
-#: ../ui/developer/dialog_new_library_script.glade.h:4
-msgid "C_reate"
-msgstr "创建(_R)"
+#: ../data/ui/developer/dialog_group_by.glade.h:10
+#, fuzzy
+#| msgid "Border Width (ems)"
+msgid "Border Width (ems):"
+msgstr "边框宽度(单位 em)"
 
-#: ../ui/developer/dialog_initial_password.glade.h:2
+#: ../data/ui/developer/dialog_initial_password.glade.h:1
 msgid "Database User"
 msgstr "数据库用户"
 
-#: ../ui/developer/dialog_initial_password.glade.h:3
+#: ../data/ui/developer/dialog_initial_password.glade.h:4
+#: ../data/ui/developer/dialog_new_group.glade.h:4
+#: ../data/ui/developer/dialog_new_library_script.glade.h:4
+msgid "C_reate"
+msgstr "创建(_R)"
+
+#: ../data/ui/developer/dialog_initial_password.glade.h:5
 msgid ""
 "Please enter the initial connection details for your database. You may add "
 "additional users later. Remember to keep this password secret because it "
@@ -3428,56 +3834,61 @@ msgstr ""
 "请填写您数据库的初始连接细节。您可以稍后添加其他用户。注意保护好此密码,因为"
 "可以使用它通过网络中的其他计算机访问您的数据。"
 
-#: ../ui/developer/dialog_initial_password.glade.h:4
+#: ../data/ui/developer/dialog_initial_password.glade.h:8
 msgid "_Confirm Password:"
 msgstr "确认密码(_C):"
 
-#: ../ui/developer/dialog_line.glade.h:1
-msgid "Color:"
-msgstr "颜色:"
+#: ../data/ui/developer/dialog_line.glade.h:1
+#: ../data/ui/developer/window_textobject.glade.h:1
+msgid "Text Object"
+msgstr "文本对象"
 
-#: ../ui/developer/dialog_line.glade.h:2
+#: ../data/ui/developer/dialog_line.glade.h:5
 msgid "Line Width:"
 msgstr "线宽:"
 
-#: ../ui/developer/dialog_line.glade.h:3
-#: ../ui/developer/window_textobject.glade.h:3
-msgid "Text Object"
-msgstr "文本对象"
+#: ../data/ui/developer/dialog_line.glade.h:6
+msgid "Color:"
+msgstr "颜色:"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:1
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:1
+msgid "Field Layout"
+msgstr "字段布局"
+
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:4
 msgid "<b>Field:</b>"
 msgstr "<b>字段:</b>"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:2
-msgid "<b>Formatting</b>"
-msgstr "<b>格式化</b>"
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:6
+msgid "Use default field title: "
+msgstr "使用默认字段标题:"
+
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:7
+msgid "Use custom title:"
+msgstr "使用自定义标题:"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:3
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:8
 msgid "<b>Title</b>"
 msgstr "<b>标题:</b>"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:5
-msgid "Field Layout"
-msgstr "字段布局"
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:9
+msgid "Use default formatting"
+msgstr "使用默认格式"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:6
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:10
 msgid "Use custom formatting"
 msgstr "使用自定义格式"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:7
-msgid "Use custom title:"
-msgstr "使用自定义标题:"
-
-#: ../ui/developer/dialog_layout_field_properties.glade.h:8
-msgid "Use default field title: "
-msgstr "使用默认字段标题:"
+#: ../data/ui/developer/dialog_layout_field_properties.glade.h:11
+msgid "<b>Formatting</b>"
+msgstr "<b>格式化</b>"
 
-#: ../ui/developer/dialog_layout_field_properties.glade.h:9
-msgid "Use default formatting"
-msgstr "使用默认格式"
+#: ../data/ui/developer/dialog_new_group.glade.h:1
+#: ../data/ui/developer/dialog_new_library_script.glade.h:1
+msgid "Create Group"
+msgstr "创建组"
 
-#: ../ui/developer/dialog_new_group.glade.h:1
+#: ../data/ui/developer/dialog_new_group.glade.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Create Group</span>\n"
 "\n"
@@ -3487,16 +3898,11 @@ msgstr ""
 "\n"
 "这个组的名称是什么?"
 
-#: ../ui/developer/dialog_new_group.glade.h:5
-#: ../ui/developer/dialog_new_library_script.glade.h:5
-msgid "Create Group"
-msgstr "创建组"
-
-#: ../ui/developer/dialog_new_group.glade.h:6
+#: ../data/ui/developer/dialog_new_group.glade.h:8
 msgid "Group name:"
 msgstr "组名:"
 
-#: ../ui/developer/dialog_new_library_script.glade.h:1
+#: ../data/ui/developer/dialog_new_library_script.glade.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Add Module</span>\n"
 "\n"
@@ -3506,46 +3912,54 @@ msgstr ""
 "\n"
 "这个模块的名称是什么?"
 
-#: ../ui/developer/dialog_new_library_script.glade.h:6
+#: ../data/ui/developer/dialog_new_library_script.glade.h:8
 msgid "Script name:"
 msgstr "脚本名称:"
 
-#: ../ui/developer/dialog_notebook.glade.h:1
+#: ../data/ui/developer/dialog_notebook.glade.h:9
 msgid "<b>Notebook Tabs</b>"
 msgstr "<b>笔记本标签页</b>"
 
-#: ../ui/developer/dialog_relationships_overview.glade.h:1
-msgid "Relationships Overview"
-msgstr "关系概览"
-
-#: ../ui/developer/dialog_script_library.glade.h:1
-msgid "Module name:"
-msgstr "模块名:"
-
-#: ../ui/developer/dialog_script_library.glade.h:2
+#: ../data/ui/developer/dialog_script_library.glade.h:1
 msgid "Script Library"
 msgstr "脚本库"
 
-#: ../ui/developer/dialog_script_library.glade.h:3
+#: ../data/ui/developer/dialog_script_library.glade.h:4
 msgid ""
 "These modules will be available to your button scripts and field "
 "calculations via the python import keyword."
 msgstr "通过 python 导入关键词,您就可以在按钮脚本和字段计算中使用这些模块了。"
 
-#. Translators: This is the verb. It is for checking that a Python script works.
-#: ../ui/developer/dialog_script_library.glade.h:5
-msgid "_Check"
+#: ../data/ui/developer/dialog_script_library.glade.h:5
+msgid "Module name:"
+msgstr "模块名:"
+
+#. Translators: This is the verb. It is for checking that a Python script works.
+#: ../data/ui/developer/dialog_script_library.glade.h:9
+msgid "_Check"
 msgstr "检查(_C)"
 
-#: ../ui/developer/dialog_sort_fields.glade.h:1
+#: ../data/ui/developer/dialog_sort_fields.glade.h:1
+msgid "Group By - Sort Fields"
+msgstr "分组依据 - 排序字段"
+
+#: ../data/ui/developer/dialog_sort_fields.glade.h:11
 msgid "<b>Sort Fields</b>"
 msgstr "<b>排序字段</b>"
 
-#: ../ui/developer/dialog_sort_fields.glade.h:2
-msgid "Group By - Sort Fields"
-msgstr "分组依据 - 排序字段"
+#: ../data/ui/developer/dialog_translation_copy.glade.h:1
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:1
+#, fuzzy
+msgid "Identify Original"
+msgstr "标识原点"
+
+#: ../data/ui/developer/dialog_translation_copy.glade.h:4
+#, fuzzy
+#| msgid "Translation"
+msgid "Copy Translation"
+msgstr "翻译"
 
-#: ../ui/developer/dialog_translation_copy.glade.h:1
+#: ../data/ui/developer/dialog_translation_copy.glade.h:5
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Copy Translation</span>\n"
 "\n"
@@ -3556,22 +3970,12 @@ msgstr ""
 "\n"
 "您想将哪种语言的翻译复制作为当前翻译的起始?"
 
-#: ../ui/developer/dialog_translation_copy.glade.h:4
-#: ../ui/developer/dialog_translation_identify_original.glade.h:5
-#, fuzzy
-msgid "Identify Original"
-msgstr "标识原点"
-
-#: ../ui/developer/dialog_translation_copy.glade.h:5
-#: ../ui/developer/dialog_translation_identify_original.glade.h:7
+#: ../data/ui/developer/dialog_translation_copy.glade.h:8
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:9
 msgid "Language:"
 msgstr "语言:"
 
-#: ../ui/developer/dialog_translation_identify_original.glade.h:1
-msgid "<b>English</b>"
-msgstr "<b>英语</b>"
-
-#: ../ui/developer/dialog_translation_identify_original.glade.h:2
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:4
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Identify Original</span>\n"
 "\n"
@@ -3581,105 +3985,122 @@ msgstr ""
 "\n"
 "原文的语言现在标识为:"
 
-#: ../ui/developer/dialog_translation_identify_original.glade.h:6
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:7
+msgid "<b>English</b>"
+msgstr "<b>英语</b>"
+
+#: ../data/ui/developer/dialog_translation_identify_original.glade.h:8
 msgid ""
 "If the text is not actually in this language, please choose the correct "
 "language."
 msgstr "如果该文本不是这种语言,请选择正确的语言。"
 
-#: ../ui/developer/dialog_user.glade.h:1
-msgid "<b>User</b>"
-msgstr "<b>用户</b>"
-
-#: ../ui/developer/dialog_user.glade.h:2
-msgid "Confirm Password:"
-msgstr "确认密码:"
-
-#: ../ui/developer/dialog_user.glade.h:3
+#: ../data/ui/developer/dialog_user.glade.h:5
 msgid "Group:"
 msgstr "组:"
 
-#: ../ui/developer/dialog_user.glade.h:4
+#: ../data/ui/developer/dialog_user.glade.h:6
 msgid "Password:"
 msgstr "密码:"
 
-#: ../ui/developer/dialog_user.glade.h:6
+#: ../data/ui/developer/dialog_user.glade.h:7
+msgid "Confirm Password:"
+msgstr "确认密码:"
+
+#: ../data/ui/developer/dialog_user.glade.h:8
 msgid "User:"
 msgstr "用户:"
 
-#: ../ui/developer/window_button_script.glade.h:1
-#: ../ui/developer/window_data_layout.glade.h:7
-#: ../ui/developer/window_imageobject.glade.h:2
-#: ../ui/developer/window_textobject.glade.h:2
-msgid "<b>Title:</b>"
-msgstr "<b>标题:</b>"
-
-#: ../ui/developer/window_button_script.glade.h:2
+#: ../data/ui/developer/window_button_script.glade.h:1
 msgid "Button Script"
 msgstr "按钮脚本"
 
-#: ../ui/developer/window_button_script.glade.h:4
+#: ../data/ui/developer/window_button_script.glade.h:5
+#: ../data/ui/developer/window_data_layout.glade.h:6
+#: ../data/ui/developer/window_imageobject.glade.h:5
+#: ../data/ui/developer/window_textobject.glade.h:5
+msgid "<b>Title:</b>"
+msgstr "<b>标题:</b>"
+
+#: ../data/ui/developer/window_button_script.glade.h:6
 msgid ""
 "When the button is clicked it will run the python function which you "
 "implement here."
 msgstr "当点击按钮时,会执行您在此处实现的 python 命令。"
 
-#: ../ui/developer/window_data_layout_export.glade.h:2
+#: ../data/ui/developer/window_data_layout_export.glade.h:1
 msgid "Export Format"
 msgstr "导出格式"
 
-#: ../ui/developer/window_data_layout.glade.h:1
-msgid "<b>Dates</b>"
-msgstr "<b>日期</b>"
-
-#: ../ui/developer/window_data_layout.glade.h:3
-msgid "<b>Lines</b>"
-msgstr "<b>直线</b>"
+#: ../data/ui/developer/window_data_layout.glade.h:1
+msgid "Layout"
+msgstr "布局"
 
-#: ../ui/developer/window_data_layout.glade.h:4
-msgid "<b>Navigation</b>"
-msgstr "<b>导航</b>"
+#: ../data/ui/developer/window_data_layout.glade.h:3
+#: ../data/ui/developer/window_report_layout.glade.h:3
+msgid "table name"
+msgstr "表名"
 
-#: ../ui/developer/window_data_layout.glade.h:5
+#: ../data/ui/developer/window_data_layout.glade.h:4
 msgid "<b>Relationship:</b>"
 msgstr "<b>关系:</b>"
 
-#: ../ui/developer/window_data_layout.glade.h:11
-msgid "Add Related Calendar"
-msgstr "添加相关日历"
+#: ../data/ui/developer/window_data_layout.glade.h:5
+msgid "Show child relationships"
+msgstr "显示次级关系"
+
+#: ../data/ui/developer/window_data_layout.glade.h:7
+msgid "Add Field"
+msgstr "添加字段"
 
-#: ../ui/developer/window_data_layout.glade.h:14
-msgid "Add _Group"
-msgstr "添加组(_G)"
+#: ../data/ui/developer/window_data_layout.glade.h:8
+msgid ""
+"Add a layout item that shows the data from a field in the record, and allows "
+"the user to edit that value."
+msgstr "添加一个显示记录中其他字段数据的布局项,并允许用户编辑该值。"
 
-#: ../ui/developer/window_data_layout.glade.h:15
+#: ../data/ui/developer/window_data_layout.glade.h:10
+msgid ""
+"Add text to a layout, such as an explanation or a warning. The text will be "
+"the same for every record viewed."
+msgstr "向布局中添加文本,如解释或警告。该文本对于每条查看记录都相同。"
+
+#: ../data/ui/developer/window_data_layout.glade.h:11
+#, fuzzy
+#| msgid "_Add Page"
+msgid "Add Image"
+msgstr "添加页面(_A)"
+
+#: ../data/ui/developer/window_data_layout.glade.h:12
+msgid ""
+"Add an image to the layout, such as a logo. The image will be the same for "
+"every record viewed. To show an image field from a record, to show different "
+"images for each field, use the field layout item."
+msgstr ""
+"向该布局添加一张图像,如徽标(logo)。该图像对于每条查看记录都相同。要显示一条"
+"记录中的图像字段、为各字段显示不同的图像,请使用字段布局项目。"
+
+#: ../data/ui/developer/window_data_layout.glade.h:14
 msgid ""
 "Add a button. Edit the button to define the script that will be run when the "
 "button is clicked."
 msgstr "添加一个按钮。编辑按钮来定义在点击按键时运行的脚本。"
 
-#: ../ui/developer/window_data_layout.glade.h:16
+#: ../data/ui/developer/window_data_layout.glade.h:16
 msgid ""
 "Add a group which can contain other layout items. Use this to group items "
 "together, such as fields."
 msgstr "添加一个包含其他布局项的分组。用它将项目归为一组,如字段。"
 
-#: ../ui/developer/window_data_layout.glade.h:17
-msgid ""
-"Add a layout item that shows the data from a field in the record, and allows "
-"the user to edit that value."
-msgstr "添加一个显示记录中其他字段数据的布局项,并允许用户编辑该值。"
-
-#: ../ui/developer/window_data_layout.glade.h:18
+#: ../data/ui/developer/window_data_layout.glade.h:18
 msgid ""
-"Add a related records calendar portal. This is a calendar showing records "
-"from a related table. Remember to edit this layout item to specify the "
-"relationship to use, and the fields to show from the related table."
+"Add a tabbed notebook. Each page of the notebook may contain several other "
+"layout items, but only one page will be visible at one time."
 msgstr ""
-"添加一个相关记录日历入口。这是一个显示相关表中记录的日历。记得编辑此布局项,"
-"指定要使用的关系和要显示的相关表中的字段。"
+"添加一个标签页式的笔记本。笔记本的每一页可以包含若干其他布局项,但同时只能显"
+"示一页。"
 
-#: ../ui/developer/window_data_layout.glade.h:19
+#: ../data/ui/developer/window_data_layout.glade.h:20
 msgid ""
 "Add a related records portal. This is a list of records in a related table. "
 "Remember to edit this layout item to specify the relationship to use, and "
@@ -3688,257 +4109,276 @@ msgstr ""
 "添加一个相关记录入口。这是一个相关表中记录的列表。记得编辑此布局项,指定要使"
 "用的关系及要显示的相关表中的字段。"
 
-#: ../ui/developer/window_data_layout.glade.h:20
+#: ../data/ui/developer/window_data_layout.glade.h:21
+msgid "Add Related Calendar"
+msgstr "添加相关日历"
+
+#: ../data/ui/developer/window_data_layout.glade.h:22
 msgid ""
-"Add a tabbed notebook. Each page of the notebook may contain several other "
-"layout items, but only one page will be visible at one time."
+"Add a related records calendar portal. This is a calendar showing records "
+"from a related table. Remember to edit this layout item to specify the "
+"relationship to use, and the fields to show from the related table."
 msgstr ""
-"添加一个标签页式的笔记本。笔记本的每一页可以包含若干其他布局项,但同时只能显"
-"示一页。"
+"添加一个相关记录日历入口。这是一个显示相关表中记录的日历。记得编辑此布局项,"
+"指定要使用的关系和要显示的相关表中的字段。"
 
-#: ../ui/developer/window_data_layout.glade.h:21
+#: ../data/ui/developer/window_data_layout.glade.h:26
 msgid ""
-"Add an image to the layout, such as a logo. The image will be the same for "
-"every record viewed. To show an image field from a record, to show different "
-"images for each field, use the field layout item."
+"Remove the item from the layout. If you remove a field layout item, it will "
+"not remove the field from the table itself. It just will not be seen on the "
+"layout."
 msgstr ""
-"向该布局添加一张图像,如徽标(logo)。该图像对于每条查看记录都相同。要显示一条"
-"记录中的图像字段、为各字段显示不同的图像,请使用字段布局项目。"
+"从布局中移除项目。如果您移除了一个字段项,它不会从表中移除,只是在布局中看不"
+"见它了而已。"
 
-#: ../ui/developer/window_data_layout.glade.h:22
+#: ../data/ui/developer/window_data_layout.glade.h:30
 msgid ""
-"Add text to a layout, such as an explanation or a warning. The text will be "
-"the same for every record viewed."
-msgstr "向布局中添加文本,如解释或警告。该文本对于每条查看记录都相同。"
+"Clicking the row button takes the user to the table specified by this "
+"relationship:"
+msgstr "点击行按钮时将用户带到此关系指定的表:"
 
-#: ../ui/developer/window_data_layout.glade.h:23
+#: ../data/ui/developer/window_data_layout.glade.h:31
 msgid "Automatic:"
 msgstr "自动:"
 
-#: ../ui/developer/window_data_layout.glade.h:24
-msgid ""
-"Clicking the row button takes the user to the table specified by this "
-"relationship:"
-msgstr "点击行按钮时将用户带到此关系指定的表:"
+#: ../data/ui/developer/window_data_layout.glade.h:32
+msgid "None"
+msgstr "无"
 
-#: ../ui/developer/window_data_layout.glade.h:25
-msgid "Column Line Width:"
-msgstr ""
+#: ../data/ui/developer/window_data_layout.glade.h:33
+msgid "<b>Navigation</b>"
+msgstr "<b>导航</b>"
 
-#: ../ui/developer/window_data_layout.glade.h:26
+#: ../data/ui/developer/window_data_layout.glade.h:35
 msgid "Date Field:"
 msgstr "日期字段:"
 
-#: ../ui/developer/window_data_layout.glade.h:29
-msgid "Line Color:\n"
-msgstr "线条颜色:\n"
-
-#: ../ui/developer/window_data_layout.glade.h:31
-msgid "Maximum number of rows:"
-msgstr "最多行数:"
+#: ../data/ui/developer/window_data_layout.glade.h:36
+msgid "<b>Dates</b>"
+msgstr "<b>日期</b>"
 
-#: ../ui/developer/window_data_layout.glade.h:32
+#: ../data/ui/developer/window_data_layout.glade.h:37
 msgid "Minimum number of rows:"
 msgstr "最少行数:"
 
-#: ../ui/developer/window_data_layout.glade.h:33
-msgid "None"
-msgstr "无"
+#: ../data/ui/developer/window_data_layout.glade.h:38
+msgid "Show at least this many rows."
+msgstr ""
 
-#: ../ui/developer/window_data_layout.glade.h:34
-msgid ""
-"Remove the item from the layout. If you remove a field layout item, it will "
-"not remove the field from the table itself. It just will not be seen on the "
-"layout."
+#: ../data/ui/developer/window_data_layout.glade.h:39
+msgid "Maximum number of rows:"
+msgstr "最多行数:"
+
+#: ../data/ui/developer/window_data_layout.glade.h:40
+msgid "Show no more than this many rows."
 msgstr ""
-"从布局中移除项目。如果您移除了一个字段项,它不会从表中移除,只是在布局中看不"
-"见它了而已。"
 
-#: ../ui/developer/window_data_layout.glade.h:35
+#: ../data/ui/developer/window_data_layout.glade.h:41
 msgid "Row Line Width:"
 msgstr ""
 
-#: ../ui/developer/window_data_layout.glade.h:36
-msgid "Show at least this many rows."
+#: ../data/ui/developer/window_data_layout.glade.h:42
+msgid "0.000"
 msgstr ""
 
-#: ../ui/developer/window_data_layout.glade.h:37
-msgid "Show child relationships"
-msgstr "显示次级关系"
-
-#: ../ui/developer/window_data_layout.glade.h:38
-msgid "Show no more than this many rows."
+#: ../data/ui/developer/window_data_layout.glade.h:43
+msgid "Column Line Width:"
 msgstr ""
 
-#: ../ui/developer/window_data_layout.glade.h:39
-#: ../ui/developer/window_report_layout.glade.h:13
-msgid "table name"
-msgstr "表名"
+#: ../data/ui/developer/window_data_layout.glade.h:44
+#, fuzzy
+#| msgid "Line Color:\n"
+msgid "Line Color:"
+msgstr "线条颜色:\n"
+
+#: ../data/ui/developer/window_data_layout.glade.h:45
+msgid "<b>Lines</b>"
+msgstr "<b>直线</b>"
 
-#: ../ui/developer/window_design.glade.h:2
+#: ../data/ui/developer/window_default_formatting.glade.h:1
+msgid "Default Formatting"
+msgstr "默认格式"
+
+#: ../data/ui/developer/window_design.glade.h:1
 msgid "Field Definitions"
 msgstr "字段定义"
 
-#: ../ui/developer/window_field_calculation.glade.h:1
+#: ../data/ui/developer/window_field_calculation.glade.h:1
 msgid "Field Calculation"
 msgstr "字段计算"
 
-#: ../ui/developer/window_field_calculation.glade.h:3
+#: ../data/ui/developer/window_field_calculation.glade.h:5
 msgid ""
 "The field value will be the return value of the python function, which you "
 "implement here."
 msgstr "字段值将是 python 函数的返回值,即此处填写的值。"
 
-#: ../ui/developer/window_field_calculation.glade.h:4
+#: ../data/ui/developer/window_field_calculation.glade.h:7
 msgid "Triggered by:"
 msgstr "触发条件:"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:1
-msgid "Default Formatting"
-msgstr "默认格式"
-
-#: ../ui/developer/window_field_definition_edit.glade.h:3
+#: ../data/ui/developer/window_field_definition_edit.glade.h:1
 msgid "Field Definition"
 msgstr "字段定义"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:4
+#: ../data/ui/developer/window_field_definition_edit.glade.h:2
 msgid "Typ_e:"
 msgstr "类型(_E):"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:5
-msgid "Value"
-msgstr "值"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:4
+msgid "_Name:"
+msgstr "名称(_N):"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:6
-msgid "_Auto-increment"
-msgstr "自动增加(_A)"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:5
+msgid "_Primary Key"
+msgstr "主键(_P)"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:7
-msgid "_Calculate Value"
-msgstr "计算值(_C)"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:6
+msgid "_Unique"
+msgstr "惟一(_U)"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:9
-msgid "_Field:"
-msgstr "字段(_F):"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:7
+msgid "_Auto-increment"
+msgstr "自动增加(_A)"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:10
+#: ../data/ui/developer/window_field_definition_edit.glade.h:9
 msgid "_Lookup value when a field changes."
 msgstr "字段更改时查阅值(_L)。"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:11
-msgid "_Name:"
-msgstr "名称(_N):"
-
-#: ../ui/developer/window_field_definition_edit.glade.h:12
-msgid "_Primary Key"
-msgstr "主键(_P)"
-
-#: ../ui/developer/window_field_definition_edit.glade.h:13
+#: ../data/ui/developer/window_field_definition_edit.glade.h:10
 msgid "_Relationship:"
 msgstr "关系(_R):"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:15
-msgid "_Unique"
-msgstr "惟一(_U)"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:11
+msgid "_Field:"
+msgstr "字段(_F):"
 
-#: ../ui/developer/window_field_definition_edit.glade.h:16
+#: ../data/ui/developer/window_field_definition_edit.glade.h:12
 msgid "_User Entry"
 msgstr "用户输入(_U)"
 
-#: ../ui/developer/box_formatting.glade.h:1
-msgid "<b>Choices</b>"
-msgstr "<b>选择</b>"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:14
+msgid "_Calculate Value"
+msgstr "计算值(_C)"
 
-#: ../ui/developer/box_formatting.glade.h:2
-msgid "<b>Numeric Formatting</b>"
-msgstr "<b>数字格式</b>"
+#: ../data/ui/developer/window_field_definition_edit.glade.h:15
+msgid "Value"
+msgstr "值"
 
-#: ../ui/developer/box_formatting.glade.h:3
-msgid "<b>Text Formatting</b>"
-msgstr "<b>文本格式</b>"
+#: ../data/ui/developer/box_formatting.glade.h:1
+msgid "Use 1000s separator"
+msgstr "使用千位分隔符"
 
-#: ../ui/developer/box_formatting.glade.h:4
-msgid "Also show:"
-msgstr "也显示:"
+#: ../data/ui/developer/box_formatting.glade.h:2
+msgid ""
+"If this is not selected then a thousands separator will not be used, even if "
+"your locale would normally use one. If it is selected then a thousands "
+"separator will be used only if your locale normally uses one."
+msgstr ""
+"如果不选择此项,将不使用千位分隔符,即使您所在区域习惯上使用它。如果选择,则"
+"只有在您所在区域通常使用千位分隔符时才会使用它。"
 
-#: ../ui/developer/box_formatting.glade.h:5
-msgid "Alternative Color for Negative Values"
-msgstr "负值的备选颜色"
+#: ../data/ui/developer/box_formatting.glade.h:3
+#, fuzzy
+#| msgid "Decimal Places"
+msgid "Decimal Places:"
+msgstr "小数点位置"
 
-#: ../ui/developer/box_formatting.glade.h:6
-msgid "Background Color:"
-msgstr "背景色:"
+#: ../data/ui/developer/box_formatting.glade.h:4
+#, fuzzy
+#| msgid "Currency Symbol"
+msgid "Currency Symbol:"
+msgstr "货币符号"
 
-#: ../ui/developer/box_formatting.glade.h:7
-msgid "Choices From Related Records"
-msgstr "相关记录中的选择"
+#: ../data/ui/developer/box_formatting.glade.h:5
+msgid "Alternative Color for Negative Values"
+msgstr "负值的备选颜色"
 
-#: ../ui/developer/box_formatting.glade.h:8
+#: ../data/ui/developer/box_formatting.glade.h:6
 msgid ""
 "Click this check box to use a different foreground color to display negative "
 "values."
 msgstr "点击此复选框来使用不同的前景色显示负值。"
 
-#: ../ui/developer/box_formatting.glade.h:9
-msgid "Click this check box to use a non-standard background color."
-msgstr "点击此复选框来使用非标准的背景色。"
+#: ../data/ui/developer/box_formatting.glade.h:7
+#, fuzzy
+#| msgid "<b>Numeric Formatting</b>"
+msgid "Numeric Formatting"
+msgstr "<b>数字格式</b>"
+
+#: ../data/ui/developer/box_formatting.glade.h:8
+msgid "Horizontal Alignment:"
+msgstr "水平对齐:"
+
+#: ../data/ui/developer/box_formatting.glade.h:9
+msgid "Multi-line"
+msgstr "多行"
+
+#: ../data/ui/developer/box_formatting.glade.h:10
+msgid ""
+"If this is selected then the field value will be shown in a multi-line box "
+"with a scrollbar."
+msgstr "如果选择此项,则字段值会显示在带滚动条的多行框中。"
 
-#: ../ui/developer/box_formatting.glade.h:10
+#: ../data/ui/developer/box_formatting.glade.h:11
+msgid "Height (lines)"
+msgstr "高度(行)"
+
+#: ../data/ui/developer/box_formatting.glade.h:12
+msgid "Font:"
+msgstr "字体:"
+
+#: ../data/ui/developer/box_formatting.glade.h:13
 msgid "Click this check box to use a non-standard font."
 msgstr "点击此复选框来使用非标准字体。"
 
-#: ../ui/developer/box_formatting.glade.h:11
+#: ../data/ui/developer/box_formatting.glade.h:14
+msgid "Foreground Color:"
+msgstr "前景色:"
+
+#: ../data/ui/developer/box_formatting.glade.h:15
 msgid "Click this check box to use a non-standard foreground color."
 msgstr "点击此复选框来使用非标准的前景色。"
 
-#: ../ui/developer/box_formatting.glade.h:12
-msgid "Currency Symbol"
-msgstr "货币符号"
-
-#: ../ui/developer/box_formatting.glade.h:13
-msgid "Custom Choice List"
-msgstr "自选列表"
+#: ../data/ui/developer/box_formatting.glade.h:16
+msgid "Background Color:"
+msgstr "背景色:"
 
-#: ../ui/developer/box_formatting.glade.h:14
-msgid "Decimal Places"
-msgstr "小数点位置"
+#: ../data/ui/developer/box_formatting.glade.h:17
+msgid "Click this check box to use a non-standard background color."
+msgstr "点击此复选框来使用非标准的背景色。"
 
-#: ../ui/developer/box_formatting.glade.h:15
-msgid "Display as radio buttons"
-msgstr "显示为单选按钮"
+#: ../data/ui/developer/box_formatting.glade.h:18
+#, fuzzy
+#| msgid "Text Format"
+msgid "Text Formatting"
+msgstr "文本格式"
 
-#: ../ui/developer/box_formatting.glade.h:17
-msgid "Font:"
-msgstr "字体:"
+#: ../data/ui/developer/box_formatting.glade.h:19
+msgid "No Choices"
+msgstr "没有选择"
 
-#: ../ui/developer/box_formatting.glade.h:18
-msgid "Foreground Color:"
-msgstr "前景色:"
+#: ../data/ui/developer/box_formatting.glade.h:20
+msgid "Relationship:"
+msgstr "关系:"
 
-#: ../ui/developer/box_formatting.glade.h:19
-msgid "Height (lines)"
-msgstr "高度(行)"
+#: ../data/ui/developer/box_formatting.glade.h:22
+msgid "Also show:"
+msgstr "也显示:"
 
-#: ../ui/developer/box_formatting.glade.h:20
-msgid "Horizontal Alignment:"
-msgstr "水平对齐:"
+#: ../data/ui/developer/box_formatting.glade.h:24
+msgid "Edit"
+msgstr "编辑"
 
-#: ../ui/developer/box_formatting.glade.h:21
-msgid ""
-"If this is not selected then a thousands separator will not be used, even if "
-"your locale would normally use one. If it is selected then a thousands "
-"separator will be used only if your locale normally uses one."
-msgstr ""
-"如果不选择此项,将不使用千位分隔符,即使您所在区域习惯上使用它。如果选择,则"
-"只有在您所在区域通常使用千位分隔符时才会使用它。"
+#: ../data/ui/developer/box_formatting.glade.h:25
+msgid "Sort Order:"
+msgstr "排序顺序:"
 
-#: ../ui/developer/box_formatting.glade.h:22
-msgid ""
-"If this is selected then the field value will be shown in a multi-line box "
-"with a scrollbar."
-msgstr "如果选择此项,则字段值会显示在带滚动条的多行框中。"
+#: ../data/ui/developer/box_formatting.glade.h:26
+msgid "Show all records"
+msgstr "显示所有记录"
 
-#: ../ui/developer/box_formatting.glade.h:23
+#: ../data/ui/developer/box_formatting.glade.h:27
 msgid ""
 "If this option is selected then the choices will list values from all "
 "records in the related table. If this option is not selected then the "
@@ -3947,164 +4387,405 @@ msgstr ""
 "如果选择此项,列出选择时将包含相关表中所有记录的值。如果不选,列出选择时将只"
 "显示相关表中的值。"
 
-#: ../ui/developer/box_formatting.glade.h:24
-msgid "Multi-line"
-msgstr "多行"
-
-#: ../ui/developer/box_formatting.glade.h:25
-msgid "No Choices"
-msgstr "没有选择"
+#: ../data/ui/developer/box_formatting.glade.h:28
+msgid "Choices From Related Records"
+msgstr "相关记录中的选择"
 
-#: ../ui/developer/box_formatting.glade.h:26
-msgid "Relationship:"
-msgstr "关系:"
+#: ../data/ui/developer/box_formatting.glade.h:29
+msgid "Custom Choice List"
+msgstr "自选列表"
 
-#: ../ui/developer/box_formatting.glade.h:27
+#: ../data/ui/developer/box_formatting.glade.h:30
 msgid "Restrict data to these choices"
 msgstr "将数据限制为这些选择"
 
-#: ../ui/developer/box_formatting.glade.h:28
-msgid "Show all records"
-msgstr "显示所有记录"
+#: ../data/ui/developer/box_formatting.glade.h:31
+msgid "Display as radio buttons"
+msgstr "显示为单选按钮"
 
-#: ../ui/developer/box_formatting.glade.h:29
-msgid "Sort Order:"
-msgstr "排序顺序:"
+#: ../data/ui/developer/box_formatting.glade.h:32
+#, fuzzy
+#| msgid "No Choices"
+msgid "Choices"
+msgstr "没有选择"
 
-#: ../ui/developer/box_formatting.glade.h:30
-msgid "Use 1000s separator"
-msgstr "使用千位分隔符"
+#: ../data/ui/developer/window_groups.glade.h:1
+msgid "Groups"
+msgstr "组"
 
-#: ../ui/developer/window_groups.glade.h:1
+#: ../data/ui/developer/window_groups.glade.h:6
+#: ../data/ui/developer/window_users.glade.h:1
+msgid "Users"
+msgstr "用户"
+
+#: ../data/ui/developer/window_groups.glade.h:7
 msgid "<b>Groups</b>"
 msgstr "<b>组</b>"
 
-#: ../ui/developer/window_groups.glade.h:2
+#: ../data/ui/developer/window_groups.glade.h:8
 msgid "<b>Tables</b>"
 msgstr "<b>表:</b>"
 
-#: ../ui/developer/window_groups.glade.h:3
-msgid "Groups"
-msgstr "组"
-
-#: ../ui/developer/window_groups.glade.h:4
-#: ../ui/developer/window_users.glade.h:3
-msgid "Users"
-msgstr "用户"
+#: ../data/ui/developer/window_imageobject.glade.h:1
+msgid "Image Object"
+msgstr "图像对象"
 
-#: ../ui/developer/window_imageobject.glade.h:1
+#: ../data/ui/developer/window_imageobject.glade.h:6
 msgid "<b>Image:</b>"
 msgstr "<b>图像:</b>"
 
-#: ../ui/developer/window_imageobject.glade.h:3
-msgid "Image Object"
-msgstr "图像对象"
+#: ../data/ui/developer/window_imageobject.glade.h:7
+#, fuzzy
+#| msgid "Choose Image"
+msgid "C_hoose Image"
+msgstr "选择图像"
 
-#: ../ui/developer/window_print_layout_edit.glade.h:1
-msgid "<b>Table Name</b>"
-msgstr "<b>表名称</b>"
+#: ../data/ui/developer/window_print_layout_edit.glade.h:2
+#, fuzzy
+#| msgid "Page _Setup"
+msgid "Page Set_up"
+msgstr "页面设置(_S)"
 
-#: ../ui/developer/window_print_layout_edit.glade.h:2
-msgid "Height:"
-msgstr "宽度:"
+#: ../data/ui/developer/window_print_layout_edit.glade.h:3
+msgid "Print Pre_view"
+msgstr ""
 
-#: ../ui/developer/window_print_layout_edit.glade.h:3
-msgid "Layout name:"
-msgstr "布局名称:"
+#: ../data/ui/developer/window_print_layout_edit.glade.h:9
+#, fuzzy
+#| msgid "Unselect All"
+msgid "Select _All"
+msgstr "全部不选"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:10
+#, fuzzy
+#| msgid "Unselect All"
+msgid "_Unselect All"
+msgstr "全部不选"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:11
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:12
+msgid "Insert _Field"
+msgstr "插入字段(_F)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:13
+msgid "Insert _Text"
+msgstr "插入文本(_T)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:14
+msgid "Insert _Image"
+msgstr "插入图像(_I)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:15
+msgid "Insert _Related Records"
+msgstr "插入相关记录(_R)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:16
+msgid "Insert _Horizontal Line"
+msgstr "插入水平线(_H)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:17
+msgid "Insert _Vertical Line"
+msgstr "插入竖直线(_V)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:18
+#, fuzzy
+#| msgid "Create Standard Layout"
+msgid "Create _Standard"
+msgstr "创建标准布局"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:19
+#, fuzzy
+#| msgid "_Add Page"
+msgid "Add Page"
+msgstr "添加页面(_A)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:20
+#, fuzzy
+#| msgid "_Delete Page"
+msgid "Delete Page"
+msgstr "删除页面(_D)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:21
+msgid "_Align"
+msgstr "对齐(_A)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:22
+msgid "Align _Top"
+msgstr "上对齐(_T)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:23
+msgid "Align _Bottom"
+msgstr "下对齐(_B)"
 
-#: ../ui/developer/window_print_layout_edit.glade.h:4
+#: ../data/ui/developer/window_print_layout_edit.glade.h:24
+msgid "Align _Left"
+msgstr "左对齐(_L)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:25
+msgid "Align _Right"
+msgstr "右对齐(_R)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:26
+#: ../data/ui/developer/window_relationships_overview.glade.h:4
+msgid "_View"
+msgstr "查看(_V)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:27
+#: ../data/ui/developer/window_relationships_overview.glade.h:5
+msgid "Show _Grid"
+msgstr "显示网格(_G)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:28
+#, fuzzy
+#| msgid "Show Rules"
+msgid "Show _Rules"
+msgstr "显示标尺"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:29
+#, fuzzy
+#| msgid "Show Outlines"
+msgid "Show _Outlines"
+msgstr "显示大纲"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:30
+msgid "Fit Page _Width"
+msgstr "适合页宽(_W)"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:32
+#, no-c-format
+msgid "Zoom 200%"
+msgstr "缩放 200%"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:34
+#, fuzzy, no-c-format
+#| msgid "Zoom 200%"
+msgid "Zoom 100%"
+msgstr "缩放 200%"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:36
+#, no-c-format
+msgid "Zoom 50%"
+msgstr "缩放 50%"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:38
+#, no-c-format
+msgid "Zoom 25%"
+msgstr "缩放 25%"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:39
 msgid "Print Layout Editor"
 msgstr "打印布局编辑器"
 
-#: ../ui/developer/window_print_layout_edit.glade.h:6
-msgid "Width:"
-msgstr "宽度:"
+#: ../data/ui/developer/window_print_layout_edit.glade.h:40
+msgid "<b>Table Name</b>"
+msgstr "<b>表名称</b>"
+
+#: ../data/ui/developer/window_print_layout_edit.glade.h:41
+msgid "Layout name:"
+msgstr "布局名称:"
 
-#: ../ui/developer/window_print_layout_edit.glade.h:7
+#: ../data/ui/developer/window_print_layout_edit.glade.h:43
 msgid "X:"
 msgstr "X:"
 
-#: ../ui/developer/window_print_layout_edit.glade.h:8
+#: ../data/ui/developer/window_print_layout_edit.glade.h:44
 msgid "Y:"
 msgstr "Y:"
 
-#: ../ui/developer/window_report_layout.glade.h:1
-msgid "<b>Available Parts</b>"
-msgstr "<b>可用部分</b>"
+#: ../data/ui/developer/window_print_layout_edit.glade.h:45
+msgid "Width:"
+msgstr "宽度:"
 
-#: ../ui/developer/window_report_layout.glade.h:2
-msgid "<b>Parts</b>"
-msgstr "<b>部分</b>"
+#: ../data/ui/developer/window_print_layout_edit.glade.h:46
+msgid "Height:"
+msgstr "宽度:"
 
-#. Translators: The Main part of the report (not the footer or header)
-#: ../ui/developer/window_report_layout.glade.h:7
-msgid "Main"
-msgstr "主体"
+#: ../data/ui/developer/window_relationships_overview.glade.h:2
+msgid "Page _Setup"
+msgstr "页面设置(_S)"
+
+#: ../data/ui/developer/window_relationships_overview.glade.h:6
+msgid "Edit _Fields"
+msgstr "编辑字段(_F)"
+
+#: ../data/ui/developer/window_relationships_overview.glade.h:7
+msgid "Edit _Relationships"
+msgstr "编辑关系(_R)"
+
+#: ../data/ui/developer/window_relationships_overview.glade.h:8
+msgid "Relationships Overview"
+msgstr "关系概览"
 
-#: ../ui/developer/window_report_layout.glade.h:8
+#: ../data/ui/developer/window_report_layout.glade.h:1
 msgid "Report Layout"
 msgstr "报表布局"
 
-#: ../ui/developer/window_report_layout.glade.h:9
+#: ../data/ui/developer/window_report_layout.glade.h:4
+msgid "_Show table title"
+msgstr "显示表标题(_S)"
+
+#: ../data/ui/developer/window_report_layout.glade.h:5
 msgid ""
 "When this is checked the table's title will be shown at the top of the "
 "report in addition to the report title."
 msgstr "若选中它,表的标题会和报表标题一起显示在报表顶部。"
 
-#: ../ui/developer/window_report_layout.glade.h:10
+#: ../data/ui/developer/window_report_layout.glade.h:6
 msgid "_Report name:"
 msgstr "报表名称(_R):"
 
-#: ../ui/developer/window_report_layout.glade.h:11
-msgid "_Show table title"
-msgstr "显示表标题(_S)"
+#: ../data/ui/developer/window_report_layout.glade.h:8
+msgid "<b>Available Parts</b>"
+msgstr "<b>可用部分</b>"
+
+#. Translators: The Main part of the report (not the footer or header)
+#: ../data/ui/developer/window_report_layout.glade.h:12
+msgid "Main"
+msgstr "主体"
+
+#: ../data/ui/developer/window_report_layout.glade.h:19
+msgid "<b>Parts</b>"
+msgstr "<b>部分</b>"
 
-#: ../ui/developer/window_text_format.glade.h:1
+#: ../data/ui/developer/window_text_format.glade.h:1
 msgid "Text Format"
 msgstr "文本格式"
 
-#: ../ui/developer/window_textobject.glade.h:1
+#: ../data/ui/developer/window_textobject.glade.h:6
 msgid "<b>Text:</b>"
 msgstr "<b>文本:</b>"
 
-#: ../ui/developer/window_translations.glade.h:1
+#: ../data/ui/developer/window_translations.glade.h:1
+msgid "Translations"
+msgstr "翻译"
+
+#: ../data/ui/developer/window_translations.glade.h:2
 msgid "<b>Source Language:</b>"
 msgstr "<b>源语言:</b>"
 
-#: ../ui/developer/window_translations.glade.h:2
-msgid "<b>Target Language:</b>"
-msgstr "<b>目标语言:</b>"
-
-#: ../ui/developer/window_translations.glade.h:3
-msgid "<b>Translations</b>"
-msgstr "<b>翻译</b>"
-
-#: ../ui/developer/window_translations.glade.h:4
-msgid "Copy From Existing Translation"
-msgstr "从现有翻译复制"
-
-#: ../ui/developer/window_translations.glade.h:5
+#: ../data/ui/developer/window_translations.glade.h:3
 msgid "English"
 msgstr "英语"
 
-#: ../ui/developer/window_translations.glade.h:7
+#: ../data/ui/developer/window_translations.glade.h:4
 msgid "Identify Source"
 msgstr "标识源"
 
-#: ../ui/developer/window_translations.glade.h:9
+#: ../data/ui/developer/window_translations.glade.h:5
+msgid "<b>Target Language:</b>"
+msgstr "<b>目标语言:</b>"
+
+#: ../data/ui/developer/window_translations.glade.h:8
+msgid "Copy From Existing Translation"
+msgstr "从现有翻译复制"
+
+#: ../data/ui/developer/window_translations.glade.h:9
 msgid ""
 "Start a translation for this target locale by copying the strings from "
 "another target locale."
 msgstr "通过从另一个目标区域复制字符串来开始此目标区域的翻译"
 
-#: ../ui/developer/window_translations.glade.h:10
-msgid "Translations"
-msgstr "翻译"
-
-#: ../ui/developer/window_users.glade.h:1
+#: ../data/ui/developer/window_users.glade.h:4
 msgid "<b>Group:</b>"
 msgstr "<b>组:</b>"
 
-#: ../ui/developer/window_users.glade.h:2
+#: ../data/ui/developer/window_users.glade.h:10
 msgid "<b>Users</b>"
 msgstr "<b>用户</b>"
+
+#~ msgid "_Recent Files"
+#~ msgstr "最近的文件(_R)"
+
+#~ msgid "_Standard"
+#~ msgstr "标准(_S)"
+
+#~ msgid "_Developer Mode"
+#~ msgstr "开发者模式(_D)"
+
+#~ msgid "_Relationships for this Table"
+#~ msgstr "该表的关系(_R)"
+
+#~ msgid "The layout to use for normal desktop environments."
+#~ msgstr "用于正常的桌面环境的布局。"
+
+#~ msgid "The layout to use for Maemo devices."
+#~ msgstr "用于 Maemo 设备的布局。"
+
+#~ msgctxt "Help menu title"
+#~ msgid "_Help"
+#~ msgstr "帮助(_H)"
+
+#~ msgid "About the application"
+#~ msgstr "关于该应用程序"
+
+#~ msgid "Help with the application"
+#~ msgstr "此应用程序的帮助"
+
+#~ msgid "There was an error while restoring the backup."
+#~ msgstr "在恢复备份时出现了一个错误。"
+
+#~ msgid "No templates available."
+#~ msgstr "没有模板可用。"
+
+#~ msgid "No help file available"
+#~ msgstr "没有帮助文件"
+
+#~ msgid "Portal"
+#~ msgstr "入口"
+
+#~ msgid "Layout Group"
+#~ msgstr "布局组"
+
+#~ msgid "Field Title"
+#~ msgstr "字段标题"
+
+#~ msgid "Could not install package"
+#~ msgstr "无法安装软件包"
+
+#~ msgid ""
+#~ "The necessary applications to install the package could not be found."
+#~ msgstr "找不到安装此软件包所需的应用程序。"
+
+#~ msgid "_Create Standard Layout"
+#~ msgstr "创建标准布局(_C)"
+
+#~ msgid "Show Grid"
+#~ msgstr "显示网格"
+
+#~ msgid "Insert"
+#~ msgstr "插入"
+
+#~ msgid ""
+#~ "Create database in its own folder, to be hosted by this computer, using "
+#~ "SQLite"
+#~ msgstr "在它自己的文件夹中创建数据库,以此计算机为宿主机,使用 SQLite"
+
+#~ msgid "Choose File"
+#~ msgstr "选择文件"
+
+#~ msgid "<b>Select Relationship</b>"
+#~ msgstr "<b>选择关系</b>"
+
+#~ msgid "<b>Summary Field</b>"
+#~ msgstr "<b>汇总字段</b>"
+
+#~ msgid "<b>Group By</b>"
+#~ msgstr "<b>分组依据</b>"
+
+#~ msgid "<b>User</b>"
+#~ msgstr "<b>用户</b>"
+
+#~ msgid "Add _Group"
+#~ msgstr "添加组(_G)"
+
+#~ msgid "<b>Choices</b>"
+#~ msgstr "<b>选择</b>"
+
+#~ msgid "<b>Text Formatting</b>"
+#~ msgstr "<b>文本格式</b>"
+
+#~ msgid "<b>Translations</b>"
+#~ msgstr "<b>翻译</b>"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]