[libgda] Update Chinese simplified translation
- From: Wylmer Wang <wylmerwang src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Update Chinese simplified translation
- Date: Sun, 5 Jan 2014 07:56:13 +0000 (UTC)
commit 5cb3aa8f223a4cf0075f2694f050263daa071e31
Author: Wylmer Wang <wantinghard gmail com>
Date: Sun Jan 5 15:56:00 2014 +0800
Update Chinese simplified translation
po/zh_CN.po | 3946 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 2132 insertions(+), 1814 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1d804d3..eeab36e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,36 +1,36 @@
# Simplified Chinese translation for libgda.
# Copyright (C) 2002, 2010, 2011 Free Software Foundation, Inc.
+#
# He Qiangqiang <carton linux net cn>, 2002.
# YunQiang Su <wzssyqa gmail com>, 2010.
-# Wylmer Wang <wantinghard gmail com>, 2010-2012.
+# Wylmer Wang <wantinghard gmail com>, 2010-2012, 2014.
# Aron Xu <aronxu gnome org>, 2011.
-#
-#: ../libgda/gda-connection.c:418
msgid ""
msgstr ""
"Project-Id-Version: libgda master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=libgda&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-22 11:29+0000\n"
-"PO-Revision-Date: 2012-06-22 17:16+0800\n"
+"POT-Creation-Date: 2013-12-19 14:34+0000\n"
+"PO-Revision-Date: 2014-01-05 15:51+0800\n"
"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language-Team: Chinese Simplified <kde-i18n-doc kde org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
#. title
-#: ../control-center/dsn-config.c:117 ../control-center/main.c:380
+#: ../control-center/dsn-config.c:136 ../control-center/main.c:380
msgid "Data Sources"
msgstr "数据源"
-#: ../control-center/dsn-config.c:118
+#: ../control-center/dsn-config.c:137
msgid "Configured data sources in the system"
msgstr "在系统中配置了的数据源"
-#: ../control-center/dsn-config.c:167
+#: ../control-center/dsn-config.c:186
msgid ""
"Data sources are the means by which database connections are identified: all "
"the information needed to open a connection to a specific database using a "
@@ -39,12 +39,12 @@ msgstr ""
"数据源是识别数据库连接的途径：所有打开某个“提供者”的特定数据库连接所需的信息"
"使用一个唯一的名字来引用。"
-#: ../control-center/dsn-config.c:249
+#: ../control-center/dsn-config.c:268
#, c-format
msgid "Are you sure you want to remove the data source '%s'?"
msgstr "确定要移除数据源 '%s' 吗？"
-#: ../control-center/dsn-config.c:253
+#: ../control-center/dsn-config.c:272
msgid "Data source removal confirmation"
msgstr "数据源删除确认"
@@ -88,41 +88,43 @@ msgstr "无法打开连接"
#: ../control-center/dsn-properties-dialog.c:232
#: ../control-center/gdaui-dsn-assistant.c:138
-#: ../libgda-ui/gdaui-raw-form.c:630
+#: ../libgda-ui/gdaui-raw-form.c:631
msgid "Unknown error"
msgstr "未知错误"
-#: ../control-center/dsn-properties-dialog.c:285
+#: ../control-center/dsn-properties-dialog.c:268
msgid "Could not execute browser program"
msgstr "无法执行浏览器程序"
#. FIXME: add a notice somewhere in the UI
-#: ../control-center/dsn-properties-dialog.c:286
-#: ../libgda/gda-connection.c:1829 ../libgda/gda-data-model.c:2359
-#: ../libgda/gda-data-model.c:2367 ../libgda/gda-data-model-dir.c:388
-#: ../libgda/gda-data-model-import.c:1679 ../libgda/gda-data-pivot.c:1315
-#: ../libgda/gda-data-pivot.c:1345 ../libgda/gda-data-pivot.c:1443
-#: ../libgda/gda-data-pivot.c:1556 ../libgda/gda-data-proxy.c:3123
-#: ../libgda/gda-data-select.c:400 ../libgda/gda-data-select.c:2308
-#: ../libgda/gda-data-select.c:2318 ../libgda/gda-data-select.c:3765
-#: ../libgda/gda-holder.c:549 ../libgda/gda-holder.c:1955
-#: ../libgda/gda-server-operation.c:633 ../libgda/gda-server-operation.c:1037
-#: ../libgda/gda-set.c:606 ../libgda/gda-tree-mgr-select.c:187
-#: ../libgda/gda-tree-mgr-select.c:222
-#: ../libgda/sqlite/gda-sqlite-provider.c:2650
-#: ../libgda/sqlite/gda-sqlite-provider.c:2662
-#: ../libgda/sqlite/gda-sqlite-provider.c:2684
-#: ../libgda/sqlite/gda-sqlite-provider.c:2874
-#: ../libgda/sqlite/gda-sqlite-provider.c:3220
-#: ../libgda/sqlite/gda-sqlite-provider.c:3232
-#: ../libgda/sqlite/gda-sqlite-provider.c:3331
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:127
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:249
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:410
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:809
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1527
-#: ../libgda/thread-wrapper/gda-thread-provider.c:451
-#: ../libgda/thread-wrapper/gda-thread-provider.c:531
+#: ../control-center/dsn-properties-dialog.c:269 ../libgda/gda-config.c:383
+#: ../libgda/gda-config.c:533 ../libgda/gda-config.c:1068
+#: ../libgda/gda-config.c:1179 ../libgda/gda-config.c:1237
+#: ../libgda/gda-config.c:1314 ../libgda/gda-connection.c:1734
+#: ../libgda/gda-data-model.c:2475 ../libgda/gda-data-model.c:2483
+#: ../libgda/gda-data-model-dir.c:388 ../libgda/gda-data-model-import.c:1721
+#: ../libgda/gda-data-pivot.c:1284 ../libgda/gda-data-pivot.c:1314
+#: ../libgda/gda-data-pivot.c:1412 ../libgda/gda-data-pivot.c:1525
+#: ../libgda/gda-data-proxy.c:3123 ../libgda/gda-data-select.c:400
+#: ../libgda/gda-data-select.c:2308 ../libgda/gda-data-select.c:2318
+#: ../libgda/gda-data-select.c:3766 ../libgda/gda-holder.c:545
+#: ../libgda/gda-holder.c:1951 ../libgda/gda-server-operation.c:633
+#: ../libgda/gda-server-operation.c:1037 ../libgda/gda-set.c:1184
+#: ../libgda/gda-tree-mgr-select.c:187 ../libgda/gda-tree-mgr-select.c:222
+#: ../libgda/sqlite/gda-sqlite-provider.c:2703
+#: ../libgda/sqlite/gda-sqlite-provider.c:2715
+#: ../libgda/sqlite/gda-sqlite-provider.c:2737
+#: ../libgda/sqlite/gda-sqlite-provider.c:2927
+#: ../libgda/sqlite/gda-sqlite-provider.c:3270
+#: ../libgda/sqlite/gda-sqlite-provider.c:3282
+#: ../libgda/sqlite/gda-sqlite-provider.c:3413
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:128
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:250
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:420
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:819
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1547
+#: ../libgda/thread-wrapper/gda-thread-provider.c:452
+#: ../libgda/thread-wrapper/gda-thread-provider.c:532
#: ../libgda-ui/data-entries/common-bin.c:81
#: ../libgda-ui/data-entries/common-bin.c:158
#: ../libgda-ui/data-entries/plugins/common-pict.c:212
@@ -131,35 +133,37 @@ msgstr "无法执行浏览器程序"
#: ../libgda-ui/data-entries/plugins/common-pict.c:424
#: ../libgda-ui/data-entries/plugins/common-pict.c:536
#: ../libgda-ui/demos/main.c:774 ../libgda-ui/gdaui-data-filter.c:161
-#: ../libgda-ui/gdaui-init.c:508 ../libgda-ui/gdaui-login.c:439
-#: ../libgda-ui/gdaui-rt-editor.c:744
-#: ../providers/jdbc/gda-jdbc-provider.c:390
-#: ../providers/jdbc/gda-jdbc-provider.c:1331
-#: ../providers/jdbc/gda-jdbc-provider.c:1360
-#: ../providers/jdbc/gda-jdbc-provider.c:1422
-#: ../providers/jdbc/gda-jdbc-provider.c:1490
+#: ../libgda-ui/gdaui-init.c:106 ../libgda-ui/gdaui-init.c:114
+#: ../libgda-ui/gdaui-init.c:545 ../libgda-ui/gdaui-login.c:448
+#: ../libgda-ui/gdaui-rt-editor.c:732
+#: ../providers/jdbc/gda-jdbc-provider.c:520
+#: ../providers/jdbc/gda-jdbc-provider.c:1467
+#: ../providers/jdbc/gda-jdbc-provider.c:1496
+#: ../providers/jdbc/gda-jdbc-provider.c:1558
+#: ../providers/jdbc/gda-jdbc-provider.c:1626
#: ../providers/jdbc/gda-jdbc-util.c:45 ../providers/jdbc/libmain.c:154
-#: ../providers/jdbc/libmain.c:164 ../providers/jdbc/libmain.c:476
-#: ../providers/ldap/gda-ldap-provider.c:832
-#: ../providers/ldap/gda-ldap-provider.c:842
-#: ../providers/ldap/gda-ldap-provider.c:871
-#: ../providers/ldap/gda-ldap-provider.c:934
+#: ../providers/jdbc/libmain.c:164 ../providers/jdbc/libmain.c:480
+#: ../providers/ldap/gda-ldap-provider.c:830
+#: ../providers/ldap/gda-ldap-provider.c:840
+#: ../providers/ldap/gda-ldap-provider.c:882
+#: ../providers/ldap/gda-ldap-provider.c:893
+#: ../providers/ldap/gda-ldap-provider.c:954
#: ../providers/mdb/gda-mdb-provider.c:359
-#: ../providers/mysql/gda-mysql-provider.c:1981
-#: ../providers/mysql/gda-mysql-provider.c:1996
+#: ../providers/mysql/gda-mysql-provider.c:2069
+#: ../providers/mysql/gda-mysql-provider.c:2084
#: ../providers/mysql/gda-mysql-util.c:69
-#: ../providers/postgres/gda-postgres-provider.c:1684
-#: ../providers/postgres/gda-postgres-provider.c:1699
+#: ../providers/postgres/gda-postgres-provider.c:1866
+#: ../providers/postgres/gda-postgres-provider.c:1881
#: ../providers/postgres/gda-postgres-util.c:104
#: ../providers/postgres/gda-postgres-util.c:107
#: ../tools/browser/auth-dialog.c:707 ../tools/browser/auth-dialog.c:710
-#: ../tools/browser/browser-connection.c:509
-#: ../tools/browser/browser-connection.c:669
-#: ../tools/browser/browser-connection.c:686
-#: ../tools/browser/browser-connection.c:865
-#: ../tools/browser/browser-connection.c:885
-#: ../tools/browser/browser-connection.c:1154
-#: ../tools/browser/browser-connection.c:1370
+#: ../tools/browser/browser-connection.c:497
+#: ../tools/browser/browser-connection.c:654
+#: ../tools/browser/browser-connection.c:671
+#: ../tools/browser/browser-connection.c:856
+#: ../tools/browser/browser-connection.c:876
+#: ../tools/browser/browser-connection.c:1145
+#: ../tools/browser/browser-connection.c:1361
#: ../tools/browser/browser-window.c:920 ../tools/browser/browser-window.c:934
#: ../tools/browser/browser-window.c:948
#: ../tools/browser/browser-window.c:1173
@@ -167,32 +171,32 @@ msgstr "无法执行浏览器程序"
#: ../tools/browser/browser-window.c:1482
#: ../tools/browser/canvas/browser-canvas-db-relations.c:423
#: ../tools/browser/canvas/browser-canvas-fkey.c:474
-#: ../tools/browser/common/ui-formgrid.c:665
-#: ../tools/browser/common/ui-formgrid.c:693
-#: ../tools/browser/common/ui-formgrid.c:724
-#: ../tools/browser/common/ui-formgrid.c:834
+#: ../tools/browser/common/ui-formgrid.c:666
+#: ../tools/browser/common/ui-formgrid.c:694
+#: ../tools/browser/common/ui-formgrid.c:725
+#: ../tools/browser/common/ui-formgrid.c:835
#: ../tools/browser/data-manager/analyser.c:278
-#: ../tools/browser/data-manager/data-console.c:564
+#: ../tools/browser/data-manager/data-console.c:561
#: ../tools/browser/data-manager/data-favorite-selector.c:201
#: ../tools/browser/data-manager/data-favorite-selector.c:259
#: ../tools/browser/data-manager/data-favorite-selector.c:619
#: ../tools/browser/data-manager/data-widget.c:388
#: ../tools/browser/ldap-browser/entry-properties.c:244
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:478
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:484
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:432
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:438
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:190
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:253
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:600
-#: ../tools/browser/ldap-browser/ldap-search-page.c:384
+#: ../tools/browser/ldap-browser/ldap-search-page.c:385
#: ../tools/browser/login-dialog.c:242 ../tools/browser/main.c:131
#: ../tools/browser/main.c:150 ../tools/browser/main.c:206
#: ../tools/browser/main.c:220 ../tools/browser/main.c:247
-#: ../tools/browser/query-exec/query-console-page.c:817
-#: ../tools/browser/query-exec/query-console-page.c:847
-#: ../tools/browser/query-exec/query-console-page.c:1047
-#: ../tools/browser/query-exec/query-console-page.c:1077
-#: ../tools/browser/query-exec/query-console-page.c:1108
-#: ../tools/browser/query-exec/query-console-page.c:1161
+#: ../tools/browser/query-exec/query-console-page.c:819
+#: ../tools/browser/query-exec/query-console-page.c:849
+#: ../tools/browser/query-exec/query-console-page.c:1050
+#: ../tools/browser/query-exec/query-console-page.c:1080
+#: ../tools/browser/query-exec/query-console-page.c:1111
+#: ../tools/browser/query-exec/query-console-page.c:1164
#: ../tools/browser/query-exec/query-favorite-selector.c:191
#: ../tools/browser/query-exec/query-favorite-selector.c:266
#: ../tools/browser/query-exec/query-favorite-selector.c:287
@@ -202,24 +206,24 @@ msgstr "无法执行浏览器程序"
#: ../tools/browser/schema-browser/favorite-selector.c:170
#: ../tools/browser/schema-browser/favorite-selector.c:352
#: ../tools/browser/schema-browser/relations-diagram.c:243
-#: ../tools/browser/schema-browser/table-columns.c:949
-#: ../tools/browser/schema-browser/table-info.c:469
-#: ../tools/browser/schema-browser/table-info.c:522
-#: ../tools/browser/schema-browser/table-info.c:549
-#: ../tools/browser/schema-browser/table-info.c:852
-#: ../tools/browser/schema-browser/table-info.c:972
+#: ../tools/browser/schema-browser/table-columns.c:952
+#: ../tools/browser/schema-browser/table-info.c:470
+#: ../tools/browser/schema-browser/table-info.c:523
+#: ../tools/browser/schema-browser/table-info.c:550
+#: ../tools/browser/schema-browser/table-info.c:853
+#: ../tools/browser/schema-browser/table-info.c:973
#: ../tools/browser/schema-browser/table-preferences.c:700
#: ../tools/browser/schema-browser/table-preferences.c:773
-#: ../tools/gda-list-server-op.c:68 ../tools/gda-list-server-op.c:126
-#: ../tools/gda-sql.c:414 ../tools/gda-sql.c:432 ../tools/gda-sql.c:593
-#: ../tools/gda-sql.c:1748 ../tools/gda-sql.c:1763 ../tools/gda-sql.c:1916
-#: ../tools/gda-sql.c:3534 ../tools/tools-input.c:129
-#: ../tools/web-server.c:2019
+#: ../tools/cmdtool/tool-input.c:102 ../tools/gda-list-server-op.c:68
+#: ../tools/gda-list-server-op.c:126 ../tools/gda-sql.c:430
+#: ../tools/gda-sql.c:460 ../tools/gda-sql.c:619 ../tools/gda-sql.c:1454
+#: ../tools/gda-sql.c:1469 ../tools/gda-sql.c:1622 ../tools/gda-sql.c:2918
+#: ../tools/web-server.c:2025
msgid "No detail"
msgstr "无细节"
#: ../control-center/gda-control-center-5.0.desktop.in.h:1
-#: ../control-center/main.c:176 ../control-center/main.c:266
+#: ../control-center/main.c:177 ../control-center/main.c:267
msgid "Database access control center"
msgstr "数据库访问控制中心"
@@ -236,15 +240,21 @@ msgstr "丢失创建数据库必需的信息"
msgid "Error creating database: %s"
msgstr "创建数据库错误：%s"
-#: ../control-center/gdaui-dsn-assistant.c:405
+#: ../control-center/gdaui-dsn-assistant.c:418
msgid "New data source definition"
msgstr "新数据源定义"
-#: ../control-center/gdaui-dsn-assistant.c:428
+#: ../control-center/gdaui-dsn-assistant.c:436
+#, fuzzy
+#| msgid ""
+#| "This assistant will guide you through the process of\n"
+#| "creating a new data source, and optionally will allow you to\n"
+#| "create a new database.\n"
+#| "\n"
+#| "Just follow the steps!"
msgid ""
-"This assistant will guide you through the process of\n"
-"creating a new data source, and optionally will allow you to\n"
-"create a new database.\n"
+"This assistant will guide you through the process of creating a new data "
+"source, and optionally will allow you to create a new database.\n"
"\n"
"Just follow the steps!"
msgstr ""
@@ -253,102 +263,126 @@ msgstr ""
"\n"
"只需要跟随这些步骤！"
-#: ../control-center/gdaui-dsn-assistant.c:434
+#: ../control-center/gdaui-dsn-assistant.c:442
msgid "Add a new data source..."
msgstr "添加一个新数据源..."
-#: ../control-center/gdaui-dsn-assistant.c:455
+#: ../control-center/gdaui-dsn-assistant.c:461
+#, fuzzy
+#| msgid ""
+#| "The following fields represent the basic information items for your new "
+#| "data source. Mandatory fields are marked with a star.\n"
+#| "To create a local database in a file, select the 'SQLite' type of "
+#| "database.\n"
msgid ""
"The following fields represent the basic information items for your new data "
-"source. Mandatory fields are marked with a star.\n"
-"To create a local database in a file, select the 'SQLite' type of database.\n"
+"source. Mandatory fields are marked with a star. To create a local database "
+"in a file, select the 'SQLite' type of database."
msgstr ""
"以下字段描述了您的新数据源的基本信息项。必填字段标有星号。\n"
"要在文件中创建一个本地数据库，请选择“SQLite”类型的数据库。\n"
-#: ../control-center/gdaui-dsn-assistant.c:463
+#: ../control-center/gdaui-dsn-assistant.c:469
msgid "Data source name"
msgstr "数据源名称"
-#: ../control-center/gdaui-dsn-assistant.c:478
+#: ../control-center/gdaui-dsn-assistant.c:484
msgid "System wide data source:"
msgstr "系统全数据源："
-#: ../control-center/gdaui-dsn-assistant.c:488
+#: ../control-center/gdaui-dsn-assistant.c:494
msgid "Database type"
msgstr "数据库类型"
-#: ../control-center/gdaui-dsn-assistant.c:498
-#: ../tools/browser/ldap-browser/class-properties.c:414
+#: ../control-center/gdaui-dsn-assistant.c:504
+#: ../tools/browser/ldap-browser/class-properties.c:416
msgid "Description:"
msgstr "描述："
-#: ../control-center/gdaui-dsn-assistant.c:510
+#: ../control-center/gdaui-dsn-assistant.c:516
msgid "General Information"
msgstr "一般信息"
-#: ../control-center/gdaui-dsn-assistant.c:528
+#: ../control-center/gdaui-dsn-assistant.c:533
+#, fuzzy
+#| msgid ""
+#| "This page lets you choose between using an existing database or to create "
+#| "a new database to use with this new data source\n"
msgid ""
"This page lets you choose between using an existing database or to create a "
-"new database to use with this new data source\n"
+"new database to use with this new data source"
msgstr "此页中您可以选择使用现有数据库或，创建一个带有新数据源的新数据库\n"
-#: ../control-center/gdaui-dsn-assistant.c:533
+#: ../control-center/gdaui-dsn-assistant.c:538
msgid "Create a new database:"
msgstr "创建一个新数据库："
-#: ../control-center/gdaui-dsn-assistant.c:542
+#: ../control-center/gdaui-dsn-assistant.c:547
msgid "Create a new database?"
msgstr "创建一个新数据库？"
-#: ../control-center/gdaui-dsn-assistant.c:555
+#: ../control-center/gdaui-dsn-assistant.c:559
+#, fuzzy
+#| msgid ""
+#| "The following fields represent the information needed to create a new "
+#| "database (mandatory fields are marked with a star).This information is "
+#| "database-specific, so check the manual for more information.\n"
msgid ""
"The following fields represent the information needed to create a new "
"database (mandatory fields are marked with a star).This information is "
-"database-specific, so check the manual for more information.\n"
+"database-specific, so check the manual for more information."
msgstr ""
"以下字段描述了创建一个新数据库所需的信息(必填字段标有星号)。该信息是针对特定"
"数据库的，所以请查阅手册了解详细信息。\n"
-#: ../control-center/gdaui-dsn-assistant.c:579
+#: ../control-center/gdaui-dsn-assistant.c:583
msgid "New database definition"
msgstr "新数据库定义"
-#: ../control-center/gdaui-dsn-assistant.c:592
+#: ../control-center/gdaui-dsn-assistant.c:595
+#, fuzzy
+#| msgid ""
+#| "The following fields represent the information needed to open a "
+#| "connection (mandatory fields are marked with a star). This information is "
+#| "database-specific, so check the manual for more information.\n"
msgid ""
"The following fields represent the information needed to open a connection "
"(mandatory fields are marked with a star). This information is database-"
-"specific, so check the manual for more information.\n"
+"specific, so check the manual for more information."
msgstr ""
"以下字段描述了打开一个连接时所需的信息(必填字段标有星号)。该信息是针对特定数"
"据库的，所以请查阅手册了解详细信息。\n"
#. connection's spec
-#: ../control-center/gdaui-dsn-assistant.c:605
-#: ../control-center/gdaui-dsn-editor.c:207
+#: ../control-center/gdaui-dsn-assistant.c:608
+#: ../control-center/gdaui-dsn-editor.c:202
msgid "Connection's parameters"
msgstr "连接参数"
-#: ../control-center/gdaui-dsn-assistant.c:618
+#: ../control-center/gdaui-dsn-assistant.c:620
msgid ""
"The following fields represent the authentication information needed to open "
"a connection."
msgstr "以下字段描述了打开一个连接所需的认证信息。"
-#: ../control-center/gdaui-dsn-assistant.c:629
+#: ../control-center/gdaui-dsn-assistant.c:631
msgid "Authentication parameters"
msgstr "认证参数"
-#: ../control-center/gdaui-dsn-assistant.c:642
+#: ../control-center/gdaui-dsn-assistant.c:643
+#, fuzzy
+#| msgid ""
+#| "All information needed to create a new data source\n"
+#| "has been retrieved. Now, press 'Apply' to close\n"
+#| "this dialog."
msgid ""
-"All information needed to create a new data source\n"
-"has been retrieved. Now, press 'Apply' to close\n"
-"this dialog."
+"All information needed to create a new data source has been retrieved. Now, "
+"press 'Apply' to close this dialog."
msgstr ""
"创建新数据源所需要的所有信息都已经检索。\n"
"现在“提交”来关闭这个对话框"
-#: ../control-center/gdaui-dsn-assistant.c:651
+#: ../control-center/gdaui-dsn-assistant.c:652
msgid "Ready to add a new data source"
msgstr "准备好添加新数据源"
@@ -356,19 +390,19 @@ msgstr "准备好添加新数据源"
msgid "Data source _name:"
msgstr "数据源名称(_N)："
-#: ../control-center/gdaui-dsn-editor.c:152
+#: ../control-center/gdaui-dsn-editor.c:151
msgid "_System wide data source:"
msgstr "全系统数据源(_S)："
-#: ../control-center/gdaui-dsn-editor.c:164
+#: ../control-center/gdaui-dsn-editor.c:162
msgid "_Provider:"
msgstr "提供者(_P)"
-#: ../control-center/gdaui-dsn-editor.c:181
+#: ../control-center/gdaui-dsn-editor.c:178
msgid "_Description:"
msgstr "描述(_D)"
-#: ../control-center/gdaui-dsn-editor.c:198
+#: ../control-center/gdaui-dsn-editor.c:194
msgid ""
"<span foreground='red'>The database provider used by this data source is not "
"available,\n"
@@ -378,7 +412,7 @@ msgstr ""
"禁用</span>"
#. connection's authentication
-#: ../control-center/gdaui-dsn-editor.c:222 ../libgda/gda-config.c:1418
+#: ../control-center/gdaui-dsn-editor.c:216 ../libgda/gda-config.c:1646
#: ../tools/browser/auth-dialog.c:286 ../tools/config-info.c:205
#: ../tools/config-info.c:365
msgid "Authentication"
@@ -404,73 +438,73 @@ msgstr ""
"没有认证要求，\n"
"确认打开了连接"
-#: ../control-center/main.c:52 ../libgda-ui/internal/utility.c:482
+#: ../control-center/main.c:53 ../libgda-ui/internal/utility.c:482
#: ../tools/browser/support.c:152
msgid "Error:"
msgstr "错误："
-#: ../control-center/main.c:78
+#: ../control-center/main.c:79
msgid "Could not declare new data source"
msgstr "无法声明新数据源"
-#: ../control-center/main.c:81
+#: ../control-center/main.c:82
msgid "No valid data source info was created"
msgstr "没有已创建的可以数据源信息"
-#: ../control-center/main.c:179 ../tools/browser/browser-window.c:1256
+#: ../control-center/main.c:180 ../tools/browser/browser-window.c:1256
msgid "Database access services for the GNOME Desktop"
msgstr "GNOME 桌面的数据库访问服务"
-#: ../control-center/main.c:195
+#: ../control-center/main.c:196
msgid "_Data source"
msgstr "数据源(_D)"
-#: ../control-center/main.c:195
+#: ../control-center/main.c:196
msgid "Database"
msgstr "数据库"
-#: ../control-center/main.c:196 ../tools/browser/browser-window.c:296
+#: ../control-center/main.c:197 ../tools/browser/browser-window.c:296
msgid "_Close"
msgstr "关闭(_C)"
-#: ../control-center/main.c:196 ../tools/browser/browser-window.c:296
+#: ../control-center/main.c:197 ../tools/browser/browser-window.c:296
msgid "Close this window"
msgstr "关闭此窗口"
-#: ../control-center/main.c:197
+#: ../control-center/main.c:198
msgid "_New datasource"
msgstr "新建数据源(_N)"
-#: ../control-center/main.c:197
+#: ../control-center/main.c:198
msgid "Create new data source"
msgstr "创建一个新的数据源"
-#: ../control-center/main.c:198
+#: ../control-center/main.c:199
msgid "_Delete datasource"
msgstr "删除数据源(_D)"
-#: ../control-center/main.c:198
+#: ../control-center/main.c:199
msgid "Delete selected data source"
msgstr "删除选中的数据源"
-#: ../control-center/main.c:199 ../tools/browser/browser-window.c:285
+#: ../control-center/main.c:200 ../tools/browser/browser-window.c:285
msgid "_Properties"
msgstr "属性(_P)"
-#: ../control-center/main.c:199
+#: ../control-center/main.c:200
msgid "Edit properties for selected data source"
msgstr "编辑选中的数据源的属性"
-#: ../control-center/main.c:200 ../control-center/main.c:201
+#: ../control-center/main.c:201 ../control-center/main.c:202
#: ../tools/browser/browser-window.c:298
msgid "_About"
msgstr "关于(_A)"
-#: ../control-center/main.c:200 ../tools/browser/browser-window.c:298
+#: ../control-center/main.c:201 ../tools/browser/browser-window.c:298
msgid "About"
msgstr "关于"
-#: ../control-center/main.c:201
+#: ../control-center/main.c:202
msgid "About GNOME-DB"
msgstr "关于 GNOME-DB"
@@ -498,103 +532,109 @@ msgstr "在批处理声明中没有找到该声明"
msgid "Conflicting parameter '%s'"
msgstr "冲突的参数 '%s'"
-#: ../libgda/gda-config.c:295 ../libgda/gda-config.c:416
-#, c-format
-msgid "Error loading authentification information for '%s' DSN: %s"
+#: ../libgda/gda-config.c:382 ../libgda/gda-config.c:408
+#: ../libgda/gda-config.c:532 ../libgda/gda-config.c:557
+#, fuzzy, c-format
+#| msgid "Error loading authentification information for '%s' DSN: %s"
+msgid "Error loading authentication information for '%s' DSN: %s"
msgstr "载入“%s” DSN 的认证信息出错：%s"
-#: ../libgda/gda-config.c:576
+#: ../libgda/gda-config.c:718
#, c-format
msgid "Error creating user specific configuration directory '%s'"
msgstr "创建用户特定的配置目录 %s 出错"
-#: ../libgda/gda-config.c:625 ../libgda/gda-config.c:638
+#: ../libgda/gda-config.c:767 ../libgda/gda-config.c:780
#, c-format
msgid ""
"User specific configuration directory '%s' exists and is not a directory"
msgstr "用户特定的配置目录 '%s' 存在但不是一个目录"
-#: ../libgda/gda-config.c:899
+#: ../libgda/gda-config.c:1042
#, c-format
msgid "Malformed data source name '%s'"
msgstr "格式错误的数据源名称 '%s'"
-#: ../libgda/gda-config.c:923
-#, c-format
-msgid "Couldn't save authentification information for DSN '%s': %s"
+#: ../libgda/gda-config.c:1067 ../libgda/gda-config.c:1079
+#: ../libgda/gda-config.c:1177
+#, fuzzy, c-format
+#| msgid "Couldn't save authentification information for DSN '%s': %s"
+msgid "Couldn't save authentication information for DSN '%s': %s"
msgstr "无法保存 DSN %s 的认证信息：%s"
-#: ../libgda/gda-config.c:955 ../libgda/gda-config.c:1083
+#: ../libgda/gda-config.c:1112 ../libgda/gda-config.c:1287
msgid "Can't manage system-wide configuration"
msgstr "无法管理全系统配置"
-#: ../libgda/gda-config.c:1010
-#, c-format
-msgid "Authentification for the '%s' DSN"
+#: ../libgda/gda-config.c:1167 ../libgda/gda-config.c:1199
+#, fuzzy, c-format
+#| msgid "Authentification for the '%s' DSN"
+msgid "Authentication for the '%s' DSN"
msgstr "“%s” DSN 认证"
-#: ../libgda/gda-config.c:1045
+#: ../libgda/gda-config.c:1236 ../libgda/gda-config.c:1248
+#: ../libgda/gda-config.c:1312
#, c-format
msgid "Couldn't delete authentication information for DSN '%s': %s"
msgstr "无法删除 DSN %s 的认证信息：%s"
-#: ../libgda/gda-config.c:1077 ../libgda-ui/gdaui-login.c:656
+#: ../libgda/gda-config.c:1281 ../libgda-ui/gdaui-login.c:665
#, c-format
msgid "Unknown DSN '%s'"
msgstr "未知的的 DSN '%s'"
-#: ../libgda/gda-config.c:1148
+#: ../libgda/gda-config.c:1376
#, c-format
msgid "Provider '%s' not found"
msgstr "提供者 '%s' 未找到"
-#: ../libgda/gda-config.c:1333 ../libgda/gda-connection.c:1239
-#: ../libgda/gda-connection.c:1402
+#: ../libgda/gda-config.c:1561 ../libgda/gda-connection.c:1168
+#: ../libgda/gda-connection.c:1331
#, c-format
msgid "No provider '%s' installed"
msgstr "没有安装的 '%s' 提供者"
-#: ../libgda/gda-config.c:1348
+#: ../libgda/gda-config.c:1576
#, c-format
msgid "Can't load provider: %s"
msgstr "无法加载提供者：%s"
-#: ../libgda/gda-config.c:1371
+#: ../libgda/gda-config.c:1599
#, c-format
msgid "Can't instantiate provider '%s'"
msgstr "无法实例化提供者 '%s'"
-#: ../libgda/gda-config.c:1415 ../libgda/gda-data-model-dsn-list.c:109
+#: ../libgda/gda-config.c:1643 ../libgda/gda-data-model-dsn-list.c:109
#: ../libgda/gda-data-model-dsn-list.c:110 ../tools/config-info.c:69
#: ../tools/config-info.c:130 ../tools/config-info.c:313
-#: ../tools/config-info.c:429 ../tools/gda-sql.c:3255 ../tools/gda-sql.c:3572
+#: ../tools/config-info.c:429 ../tools/gda-sql.c:2636 ../tools/gda-sql.c:2980
msgid "Provider"
msgstr "提供者"
-#: ../libgda/gda-config.c:1416 ../libgda/gda-data-model-dsn-list.c:115
+#: ../libgda/gda-config.c:1644 ../libgda/gda-data-model-dsn-list.c:115
#: ../libgda/gda-data-model-dsn-list.c:116
#: ../tools/browser/data-manager/data-source-editor.c:166
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:307
#: ../tools/config-info.c:70 ../tools/config-info.c:144
-#: ../tools/config-info.c:327 ../tools/gda-sql.c:3254 ../tools/gda-sql.c:3868
+#: ../tools/config-info.c:327 ../tools/gda-sql.c:2635 ../tools/gda-sql.c:3279
msgid "Description"
msgstr "描述"
-#: ../libgda/gda-config.c:1417 ../tools/config-info.c:158
+#: ../libgda/gda-config.c:1645 ../tools/config-info.c:158
msgid "DSN parameters"
msgstr "DSN 参数"
-#: ../libgda/gda-config.c:1419 ../tools/config-info.c:244
+#: ../libgda/gda-config.c:1647 ../tools/config-info.c:244
msgid "File"
msgstr "文件"
-#: ../libgda/gda-config.c:1420
+#: ../libgda/gda-config.c:1648
msgid "List of installed providers"
msgstr "已安装的提供者"
-#: ../libgda/gda-config.c:1594 ../libgda/gda-data-model-dsn-list.c:129
+#: ../libgda/gda-config.c:1821 ../libgda/gda-data-model-dsn-list.c:129
#: ../libgda/gda-data-model-dsn-list.c:130
-#: ../providers/ldap/ldap_specs_auth.xml.in.h:1 ../tools/gda-sql.c:3574
+#: ../providers/ldap/ldap_specs_auth.xml.in.h:1 ../tools/gda-sql.c:2982
msgid "Username"
msgstr "用户名"
@@ -603,7 +643,7 @@ msgstr "用户名"
#. This file contains the CREATE ROLE operation's parameters, which is
#. available since PostgreSQL 8.1
#.
-#: ../libgda/gda-config.c:1596 ../providers/ldap/ldap_specs_auth.xml.in.h:3
+#: ../libgda/gda-config.c:1823 ../providers/ldap/ldap_specs_auth.xml.in.h:3
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:87
#: ../providers/postgres/postgres_specs_create_role.xml.in.h:20
#: ../providers/postgres/postgres_specs_create_user.xml.in.h:4
@@ -611,29 +651,29 @@ msgstr "用户名"
msgid "Password"
msgstr "口令"
-#: ../libgda/gda-config.c:1666
+#: ../libgda/gda-config.c:1893
#, c-format
msgid "Error loading provider '%s': %s"
msgstr "加载提供者 '%s' 参数：%s"
-#: ../libgda/gda-connection.c:352
+#: ../libgda/gda-connection.c:340
msgid "DSN to use"
msgstr "要使用的 DSN"
-#: ../libgda/gda-connection.c:355
+#: ../libgda/gda-connection.c:343
msgid "Connection string to use"
msgstr "要使用的连接字符串"
-#: ../libgda/gda-connection.c:358
+#: ../libgda/gda-connection.c:346
msgid "Provider to use"
msgstr "要使用的提供者"
-#: ../libgda/gda-connection.c:363
+#: ../libgda/gda-connection.c:351
msgid "Authentication string to use"
msgstr "要使用的认证字符串"
-#: ../libgda/gda-connection.c:367 ../libgda-ui/data/server_operation.glade.h:6
-#: ../libgda-ui/gdaui-server-operation.c:794
+#: ../libgda/gda-connection.c:355 ../libgda-ui/data/server_operation.glade.h:6
+#: ../libgda-ui/gdaui-server-operation.c:778
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:8
#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:8
#: ../providers/postgres/postgres_specs_dsn.xml.in.h:9
@@ -641,181 +681,205 @@ msgid "Options"
msgstr "选项"
#. To translators: Don't translate "GdaMetaStore", it's a class name
-#: ../libgda/gda-connection.c:372
+#: ../libgda/gda-connection.c:360
msgid "GdaMetaStore used by the connection"
msgstr "连接使用的 GdaMetaStore"
-#: ../libgda/gda-connection.c:378
+#: ../libgda/gda-connection.c:366
msgid ""
"Unique GThread from which the connection will be available.This should only "
"be modified by the database providers' implementation"
msgstr "提供连接的惟一的 GThread。应该只有数据库提供者的实例才能修改它"
-#: ../libgda/gda-connection.c:389
+#: ../libgda/gda-connection.c:384
+#, fuzzy
+#| msgid ""
+#| "Tells if the connection acts as a thread wrapper around another "
+#| "connection, making it completely thread safe"
msgid ""
-"Tells if the connection acts as a thread wrapper around another connection, "
-"making it completely thread safe"
+"Determines if the connection acts as a thread wrapper around another "
+"connection, making it completely thread safe"
msgstr "说明此连接是否作为另一连接的线程封装器，以保证它完全线程安全"
-#: ../libgda/gda-connection.c:404
+#: ../libgda/gda-connection.c:400
msgid ""
"Make the connection set up a monitoring function in the mainloop to monitor "
"the wrapped connection"
msgstr "使该连接在主循环中设置一个监视函数来监视被封装连接"
-#: ../libgda/gda-connection.c:431
+#: ../libgda/gda-connection.c:414
+msgid "Number of history events to keep in memory"
+msgstr "内存中保留的最大历史事件数"
+
+#: ../libgda/gda-connection.c:427
msgid "Computes execution delay for each executed statement"
msgstr "计算每条执行语句的执行延迟"
-#: ../libgda/gda-connection.c:445
+#: ../libgda/gda-connection.c:441
msgid "Artificially slows down the execution of queries"
-msgstr ""
+msgstr "人为减慢查询执行"
-#: ../libgda/gda-connection.c:763 ../libgda/gda-connection.c:792
-#: ../libgda/gda-connection.c:807 ../libgda/gda-connection.c:823
+#: ../libgda/gda-connection.c:733 ../libgda/gda-connection.c:762
+#: ../libgda/gda-connection.c:777 ../libgda/gda-connection.c:793
#, c-format
msgid "Could not set the '%s' property when the connection is opened"
msgstr "连接打开时无法设置 “%s”属性"
-#: ../libgda/gda-connection.c:771
+#: ../libgda/gda-connection.c:741
#, c-format
msgid "No DSN named '%s' defined"
msgstr "没有定义名为 '%s' 的 DSN"
-#: ../libgda/gda-connection.c:849
+#: ../libgda/gda-connection.c:815
#, c-format
msgid "Can't set the '%s' property once the connection is opened"
msgstr "连接打开时无法设置 “%s”属性"
-#: ../libgda/gda-connection.c:1184 ../libgda/gda-connection.c:1343
-#: ../libgda/thread-wrapper/gda-thread-provider.c:424
-#: ../libgda/thread-wrapper/gda-thread-provider.c:565
+#: ../libgda/gda-connection.c:1113 ../libgda/gda-connection.c:1272
+#: ../libgda/thread-wrapper/gda-thread-provider.c:425
+#: ../libgda/thread-wrapper/gda-thread-provider.c:566
msgid "Multi threading is not supported or enabled"
msgstr "多线程不受支持或未启用"
-#: ../libgda/gda-connection.c:1193
+#: ../libgda/gda-connection.c:1122
#, c-format
msgid "Malformed data source specification '%s'"
msgstr "格式错误的数据源规范 '%s'"
-#: ../libgda/gda-connection.c:1201 ../libgda/gda-connection.c:1650
-#: ../libgda/gda-connection.c:1652
+#: ../libgda/gda-connection.c:1130 ../libgda/gda-connection.c:1565
+#: ../libgda/gda-connection.c:1567
#, c-format
msgid "Data source %s not found in configuration"
msgstr "无法在配置中找到数据源 %s"
-#: ../libgda/gda-connection.c:1261
+#: ../libgda/gda-connection.c:1190
msgid "Datasource configuration error: no provider specified"
msgstr "数据源配置错误：没有指定提供者"
-#: ../libgda/gda-connection.c:1353 ../tools/browser/auth-dialog.c:448
-#: ../tools/browser/auth-dialog.c:485 ../tools/gda-sql.c:1566
+#: ../libgda/gda-connection.c:1282 ../tools/browser/auth-dialog.c:448
+#: ../tools/browser/auth-dialog.c:485 ../tools/gda-sql.c:1264
#, c-format
msgid "Malformed connection string '%s'"
msgstr "无效的连接字符串 '%s'"
-#: ../libgda/gda-connection.c:1359 ../libgda/gda-connection.c:1674
-msgid "No provider specified"
-msgstr "没有指定的提供者"
+#: ../libgda/gda-connection.c:1288
+#, fuzzy
+#| msgid "No table specified"
+msgid "No database driver specified"
+msgstr "没有指定表"
-#: ../libgda/gda-connection.c:1662 ../libgda/gda-connection.c:1664
+#: ../libgda/gda-connection.c:1577 ../libgda/gda-connection.c:1579
msgid "No DSN or connection string specified"
msgstr "没有指定 DSN 或连接字符串"
-#: ../libgda/gda-connection.c:1689 ../libgda/gda-connection.c:1700
+#: ../libgda/gda-connection.c:1589
+msgid "No provider specified"
+msgstr "没有指定的提供者"
+
+#: ../libgda/gda-connection.c:1613
msgid "Provider does not allow usage from this thread"
msgstr "提供者不允许从此线程的使用"
-#: ../libgda/gda-connection.c:1715
+#: ../libgda/gda-connection.c:1620
msgid ""
"Internal error: provider does not implement the open_connection() virtual "
"method"
msgstr "内部错误：提供者没有实现 open_connection() 虚方法"
-#: ../libgda/gda-connection.c:1828
+#: ../libgda/gda-connection.c:1733
#, c-format
msgid "Error while maintaining the meta data up to date: %s"
msgstr "维持元数据为最新时出错：%s"
-#: ../libgda/gda-connection.c:2997
+#: ../libgda/gda-connection.c:1967
+msgid "Provider does not provide a GdaDataHandler for dates"
+msgstr "提供者没有为日期提供一个 GdaDataHandler"
+
+#: ../libgda/gda-connection.c:3023
msgid "Provider does not support statement preparation"
msgstr "提供者不支持声明准备"
-#: ../libgda/gda-connection.c:3243 ../libgda/gda-connection.c:3339
-#: ../libgda/gda-connection.c:3409 ../libgda/gda-meta-store.c:888
+#: ../libgda/gda-connection.c:3272 ../libgda/gda-connection.c:3377
+#: ../libgda/gda-connection.c:3447 ../libgda/gda-meta-store.c:900
#, c-format
msgid "Can't obtain connection lock"
msgstr "无法获得连接锁"
-#: ../libgda/gda-connection.c:3250 ../libgda/gda-connection.c:3480
-#: ../libgda/gda-connection.c:3854 ../libgda/gda-connection.c:3954
-#: ../libgda/gda-connection.c:4050 ../libgda/gda-connection.c:6536
+#: ../libgda/gda-connection.c:3279 ../libgda/gda-connection.c:3518
+#: ../libgda/gda-connection.c:3892 ../libgda/gda-connection.c:3992
+#: ../libgda/gda-connection.c:4088 ../libgda/gda-connection.c:6568
#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:169
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:391
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1717
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:401
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1718
#, c-format
msgid "Connection is closed"
msgstr "连接已关闭"
-#: ../libgda/gda-connection.c:3354 ../libgda/gda-connection.c:3447
+#: ../libgda/gda-connection.c:3287
+#, fuzzy, c-format
+#| msgid "Named transaction is not supported"
+msgid "Asynchronous execution is not supported"
+msgstr "不支持命名事务"
+
+#: ../libgda/gda-connection.c:3392 ../libgda/gda-connection.c:3485
#, c-format
msgid "Can't find task %u"
msgstr "无法找到任务 %u"
-#: ../libgda/gda-connection.c:3432 ../libgda/sqlite/gda-sqlite-provider.c:1309
-#: ../libgda/thread-wrapper/gda-thread-provider.c:987
-#: ../providers/jdbc/gda-jdbc-provider.c:580
-#: ../providers/mysql/gda-mysql-provider.c:952
-#: ../providers/postgres/gda-postgres-provider.c:875
-#: ../providers/web/gda-web-provider.c:685
+#: ../libgda/gda-connection.c:3470 ../libgda/sqlite/gda-sqlite-provider.c:1315
+#: ../libgda/thread-wrapper/gda-thread-provider.c:988
+#: ../providers/jdbc/gda-jdbc-provider.c:715
+#: ../providers/mysql/gda-mysql-provider.c:1004
+#: ../providers/postgres/gda-postgres-provider.c:1034
+#: ../providers/web/gda-web-provider.c:686
msgid "Provider does not support asynchronous server operation"
msgstr "提供者不支持异步服务器操作"
-#: ../libgda/gda-connection.c:3725 ../libgda/gda-connection.c:3740
+#: ../libgda/gda-connection.c:3763 ../libgda/gda-connection.c:3778
msgid "Statement is a selection statement"
msgstr "语句是一条选择语句"
-#: ../libgda/gda-connection.c:3797 ../libgda/gda-connection.c:3902
-#: ../libgda/gda-connection.c:3997
+#: ../libgda/gda-connection.c:3835 ../libgda/gda-connection.c:3940
+#: ../libgda/gda-connection.c:4035
msgid "Statement is not a selection statement"
msgstr "语句不是一条选择语句"
-#: ../libgda/gda-connection.c:4491
+#: ../libgda/gda-connection.c:4531
msgid "Invalid argument"
msgstr "无效参数"
-#: ../libgda/gda-connection.c:4501
+#: ../libgda/gda-connection.c:4541
#, c-format
msgid "Missing or wrong arguments for table '%s': %s"
msgstr "表 '%s' 丢失或有错误的参数：%s"
-#: ../libgda/gda-connection.c:5265
+#: ../libgda/gda-connection.c:5305
msgid "Meta update error"
msgstr "元数据更新错误"
-#: ../libgda/gda-connection.c:5829
+#: ../libgda/gda-connection.c:5869
msgid "Wrong filter arguments"
msgstr "错误的过滤器参数"
-#: ../libgda/gda-connection.c:6017 ../libgda/gda-connection.c:6070
-#: ../libgda/gda-connection.c:6114 ../libgda/gda-connection.c:6158
-#: ../libgda/gda-connection.c:6202
+#: ../libgda/gda-connection.c:6057 ../libgda/gda-connection.c:6110
+#: ../libgda/gda-connection.c:6154 ../libgda/gda-connection.c:6198
+#: ../libgda/gda-connection.c:6242
#, c-format
msgid "Connection transaction status tracking: no transaction exists for %s"
msgstr "连接事务状态跟踪：不存在 %s 的事务"
#: ../libgda/gda-data-access-wrapper.c:636
#: ../libgda/gda-data-meta-wrapper.c:578 ../libgda/gda-data-model-array.c:439
-#: ../libgda/gda-data-model-array.c:670 ../libgda/gda-data-model-bdb.c:656
-#: ../libgda/gda-data-model-bdb.c:760 ../libgda/gda-data-model-bdb.c:789
+#: ../libgda/gda-data-model-array.c:670 ../libgda/gda-data-model-bdb.c:657
+#: ../libgda/gda-data-model-bdb.c:761 ../libgda/gda-data-model-bdb.c:790
#: ../libgda/gda-data-model-dir.c:786 ../libgda/gda-data-model-dir.c:885
#: ../libgda/gda-data-model-dir.c:927 ../libgda/gda-data-model-dsn-list.c:311
-#: ../libgda/gda-data-model-iter.c:402 ../libgda/gda-data-model-iter.c:1122
-#: ../libgda/gda-data-proxy.c:3558 ../libgda/gda-data-proxy.c:3682
+#: ../libgda/gda-data-model-iter.c:402 ../libgda/gda-data-model-iter.c:1123
+#: ../libgda/gda-data-proxy.c:3561 ../libgda/gda-data-proxy.c:3685
#: ../libgda/gda-data-select.c:1320 ../libgda/gda-data-select.c:1904
#: ../libgda/gda-data-select.c:2860 ../libgda/gda-data-select.c:2927
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:898
-#: ../libgda-ui/gdaui-combo.c:789
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:918
+#: ../libgda-ui/gdaui-combo.c:825
#, c-format
msgid "Column %d out of range (0-%d)"
msgstr "列 %d 超出范围 (0-%d)"
@@ -876,8 +940,8 @@ msgstr "数据模型可否修改"
#: ../libgda/gda-data-model-array.c:509 ../libgda/gda-data-model-array.c:661
#: ../libgda/gda-data-model-array.c:748 ../libgda/gda-data-model-dir.c:797
#: ../libgda/gda-data-model-dir.c:971 ../libgda/gda-data-model-dir.c:1337
-#: ../libgda/gda-data-model-dsn-list.c:319 ../libgda/gda-data-proxy.c:3631
-#: ../libgda/gda-data-proxy.c:3669 ../libgda/gda-data-select.c:1853
+#: ../libgda/gda-data-model-dsn-list.c:319 ../libgda/gda-data-proxy.c:3634
+#: ../libgda/gda-data-proxy.c:3672 ../libgda/gda-data-select.c:1853
#: ../libgda/gda-data-select.c:1914
#, c-format
msgid "Row %d out of range (0-%d)"
@@ -886,8 +950,8 @@ msgstr "行 %d 超出范围 (0-%d)"
#: ../libgda/gda-data-model-array.c:513 ../libgda/gda-data-model-array.c:664
#: ../libgda/gda-data-model-array.c:751 ../libgda/gda-data-model-dir.c:800
#: ../libgda/gda-data-model-dir.c:974 ../libgda/gda-data-model-dir.c:1340
-#: ../libgda/gda-data-model-dsn-list.c:322 ../libgda/gda-data-proxy.c:3634
-#: ../libgda/gda-data-proxy.c:3672 ../libgda/gda-data-select.c:1856
+#: ../libgda/gda-data-model-dsn-list.c:322 ../libgda/gda-data-proxy.c:3637
+#: ../libgda/gda-data-proxy.c:3675 ../libgda/gda-data-select.c:1856
#: ../libgda/gda-data-select.c:1917
#, c-format
msgid "Row %d not found (empty data model)"
@@ -907,7 +971,7 @@ msgid "Attempting to modify a read-only data model"
msgstr "正在试图修改只读数据模型"
#: ../libgda/gda-data-model-array.c:791 ../libgda/gda-data-model-array.c:830
-#: ../libgda/gda-data-model.c:861
+#: ../libgda/gda-data-model.c:864
msgid "Too many values in list"
msgstr "列表中的值太多"
@@ -915,152 +979,169 @@ msgstr "列表中的值太多"
msgid "Row not found in data model"
msgstr "数据模型中没有找到行"
-#: ../libgda/gda-data-model-bdb.c:261
+#: ../libgda/gda-data-model-bdb.c:262
#, c-format
msgid "Could not load the Berkeley DB library: %s"
msgstr "无法加载 Berkeley DB 库：%s"
-#: ../libgda/gda-data-model-bdb.c:265 ../libgda/gda-data-model-bdb.c:269
+#: ../libgda/gda-data-model-bdb.c:266 ../libgda/gda-data-model-bdb.c:270
#, c-format
msgid "Could not load the '%s' symbol from the Berkeley DB library"
msgstr "无法从 Berkeley DB 库加载 '%s' 符号"
-#: ../libgda/gda-data-model-bdb.c:292 ../libgda/gda-data-model-bdb.c:366
+#: ../libgda/gda-data-model-bdb.c:293 ../libgda/gda-data-model-bdb.c:367
msgid "Berkeley DB library not loaded"
msgstr "Berkeley DB 库未加载"
-#: ../libgda/gda-data-model-bdb.c:694 ../libgda/gda-data-model-bdb.c:727
-#: ../libgda/gda-data-model-bdb.c:833 ../libgda/gda-data-model-bdb.c:924
+#: ../libgda/gda-data-model-bdb.c:695 ../libgda/gda-data-model-bdb.c:728
+#: ../libgda/gda-data-model-bdb.c:834 ../libgda/gda-data-model-bdb.c:925
#, c-format
msgid ""
"Custom BDB model implementation is not complete: the '%s' method is missing"
msgstr "自定义 BDB 模型实现不完整：丢失 '%s' 方法"
-#: ../libgda/gda-data-model-bdb.c:861 ../libgda/gda-data-model-bdb.c:951
+#: ../libgda/gda-data-model-bdb.c:862 ../libgda/gda-data-model-bdb.c:952
#, c-format
msgid "Expected GdaBinary value, got %s"
msgstr "期望 GdaBinary 值，但是获得了 %s"
-#: ../libgda/gda-data-model-bdb.c:907
+#: ../libgda/gda-data-model-bdb.c:908
msgid "Key modification is not supported"
msgstr "键修改不受支持"
-#: ../libgda/gda-data-model.c:702
+#: ../libgda/gda-data-model.c:705
msgid "Data model does not support getting individual value"
msgstr "数据模型不支持获取个体值"
-#: ../libgda/gda-data-model.c:745 ../libgda/gda-data-model.c:755
+#: ../libgda/gda-data-model.c:748 ../libgda/gda-data-model.c:758
#, c-format
msgid "Data model returned value of invalid '%s' type"
msgstr "数据模型返回了无效类型 '%s' 的值"
-#: ../libgda/gda-data-model.c:752
+#: ../libgda/gda-data-model.c:755
msgid "Data model returned invalid NULL value"
msgstr "数据模型返回无效的 NULL 值"
-#: ../libgda/gda-data-model.c:822
+#: ../libgda/gda-data-model.c:825
msgid "Data model does not support setting individual value"
msgstr "数据模型不支持设置个体值"
-#: ../libgda/gda-data-model.c:880
+#: ../libgda/gda-data-model.c:883
msgid "Data model does not support setting values"
msgstr "数据模型不支持设置值"
-#: ../libgda/gda-data-model.c:1044 ../libgda/gda-data-model.c:1080
+#: ../libgda/gda-data-model.c:1047 ../libgda/gda-data-model.c:1083
msgid "Data model does not support row append"
msgstr "数据模型不支持行追加"
-#: ../libgda/gda-data-model.c:1071
+#: ../libgda/gda-data-model.c:1074
msgid "Model does not allow row insertion"
msgstr "模型不允许行插入"
-#: ../libgda/gda-data-model.c:1108
+#: ../libgda/gda-data-model.c:1111
msgid "Model does not allow row deletion"
msgstr "模型不支持行删除"
-#: ../libgda/gda-data-model.c:1117
+#: ../libgda/gda-data-model.c:1120
msgid "Data model does not support row removal"
msgstr "数据模型不支持删除行"
-#: ../libgda/gda-data-model.c:1296 ../libgda/gda-data-model.c:1337
-#: ../libgda/gda-data-model.c:1351
+#: ../libgda/gda-data-model.c:1299 ../libgda/gda-data-model.c:1338
+#: ../libgda/gda-data-model.c:1352
#, c-format
msgid "The '%s' parameter must hold a string value, ignored."
msgstr "'%s' 必须保持为字符串值，已忽略。"
-#: ../libgda/gda-data-model.c:1360 ../libgda/gda-data-model.c:1370
-#: ../libgda/gda-data-model.c:1380 ../libgda/gda-data-model.c:1422
-#: ../libgda/gda-data-model.c:1520
+#: ../libgda/gda-data-model.c:1361 ../libgda/gda-data-model.c:1371
+#: ../libgda/gda-data-model.c:1381 ../libgda/gda-data-model.c:1423
+#: ../libgda/gda-data-model.c:1468 ../libgda/gda-data-model.c:1478
+#: ../libgda/gda-data-model.c:1488 ../libgda/gda-data-model.c:1498
+#: ../libgda/gda-data-model.c:1526 ../libgda/gda-data-model.c:1536
+#: ../libgda/gda-data-model.c:1637
#, c-format
msgid "The '%s' parameter must hold a boolean value, ignored."
msgstr "'%s' 必须保持为布尔值，已忽略。"
-#: ../libgda/gda-data-model.c:1528
+#: ../libgda/gda-data-model.c:1516
+#, fuzzy, c-format
+#| msgid "The '%s' parameter must hold a string value, ignored."
+msgid "The '%s' parameter must hold an integer value, ignored."
+msgstr "'%s' 必须保持为字符串值，已忽略。"
+
+#: ../libgda/gda-data-model.c:1558
+#, c-format
+msgid "Unknown GdaDataModelIOFormat %d value"
+msgstr "未知的 GdaDataModelIOFormat %d 值"
+
+#: ../libgda/gda-data-model.c:1644
#, c-format
msgid "File '%s' already exists"
msgstr "文件 '%s' 已经存在"
-#: ../libgda/gda-data-model.c:1705
+#: ../libgda/gda-data-model.c:1821
msgid "Exported Data"
msgstr "已导出的数据"
-#: ../libgda/gda-data-model.c:1826
+#: ../libgda/gda-data-model.c:1942
#, c-format
msgid "Expected tag <gda_value> or <gda_array_value>, got <%s>, ignoring"
msgstr "期望 <gda_value> 或 <gda_array_value> 标记，然而获得了 <%s>，忽略"
-#: ../libgda/gda-data-model.c:1856
+#: ../libgda/gda-data-model.c:1972
msgid "Cannot retrieve column data type (type is UNKNOWN or not specified)"
msgstr "无法检索列数据类型 (类型是 UNKNOWN 或未指定)"
-#: ../libgda/gda-data-model.c:1940
+#: ../libgda/gda-data-model.c:2058
#, c-format
msgid "Expected tag <gda_array_data>, got <%s>"
msgstr "期望标记 <gda_array_data>，然而获得了 <%s>"
-#: ../libgda/gda-data-model.c:2012
+#: ../libgda/gda-data-model.c:2130
msgid "Could not get an iterator for source data model"
msgstr "无法为源数据模型获取一个迭代器"
-#: ../libgda/gda-data-model.c:2029
+#: ../libgda/gda-data-model.c:2147
#, c-format
msgid "Inexistent column in source data model: %d"
msgstr "源数据模型中不存在的列：%d"
-#: ../libgda/gda-data-model.c:2043
+#: ../libgda/gda-data-model.c:2161
#, c-format
msgid ""
"Destination column %d can't be NULL but has no correspondence in the source "
"data model"
msgstr "目的列 %d 不能为 NULL 但是在源数据模型中没有对应值"
-#: ../libgda/gda-data-model.c:2053
+#: ../libgda/gda-data-model.c:2171
#, c-format
msgid ""
"Destination column %d has a gda type (%s) incompatible with source column %d "
"type (%s)"
msgstr "目的列 %d 的 gda 类型 (%s) 不兼容于来源列 %d 的类型 (%s)"
-#: ../libgda/gda-data-model.c:2149
+#: ../libgda/gda-data-model.c:2267
#, c-format
msgid "Can't transform '%s' from GDA type %s to GDA type %s"
msgstr "无法将 '%s' 从 GDA 类型 %s 转换到 GDA 类型 %s"
-#: ../libgda/gda-data-model.c:2358
+#: ../libgda/gda-data-model.c:2474
#, c-format
msgid "Could not dump data model's attributes: %s"
msgstr "无法转储数据模型属性：%s"
-#: ../libgda/gda-data-model.c:2366
+#: ../libgda/gda-data-model.c:2482
#, c-format
msgid "Could not dump data model's contents: %s"
msgstr "无法转储数据模型内容：%s"
-#: ../libgda/gda-data-model.c:2657
-msgid "Data model does not support backward cursor move, not displaying data"
+#: ../libgda/gda-data-model.c:2704
+#, fuzzy
+#| msgid ""
+#| "Data model does not support backward cursor move, not displaying data"
+msgid "Data model does not support backward cursor move"
msgstr "数据模型不支持后台游标移动，没有正在显示数据"
-#: ../libgda/gda-data-model.c:2793
+#: ../libgda/gda-data-model.c:3003
#: ../tools/browser/common/gdaui-entry-import.c:214
#: ../tools/browser/query-exec/query-result.c:229
#, c-format
@@ -1068,7 +1149,7 @@ msgid "%d row"
msgid_plural "%d rows"
msgstr[0] "%d 行"
-#: ../libgda/gda-data-model.c:2795
+#: ../libgda/gda-data-model.c:3005
#, c-format
msgid "0 row"
msgstr "0 行"
@@ -1130,7 +1211,7 @@ msgstr "无法移除文件 '%s'"
#: ../libgda/gda-data-model-dsn-list.c:103
#: ../libgda/gda-data-model-dsn-list.c:104 ../tools/config-info.c:427
-#: ../tools/gda-sql.c:3253
+#: ../tools/gda-sql.c:2634
msgid "DSN"
msgstr "DSN"
@@ -1150,119 +1231,119 @@ msgstr "全局"
msgid "List of defined data sources"
msgstr "已定义的数据源列表"
-#: ../libgda/gda-data-model-import.c:494
+#: ../libgda/gda-data-model-import.c:504
+msgid "\"options\" property is not a GdaSet object"
+msgstr "“options”属性不是一个 GdaSet 对象"
+
+#: ../libgda/gda-data-model-import.c:718
#, c-format
msgid "The '%s' option must hold a string value, ignored."
msgstr "'%s' 选项必须保持为字符串类型，已忽略。"
-#: ../libgda/gda-data-model-import.c:510
+#: ../libgda/gda-data-model-import.c:734
#, c-format
msgid "The '%s' option must hold a boolean value, ignored."
msgstr "'%s' 选项必须保持为布尔型值，已忽略。"
-#: ../libgda/gda-data-model-import.c:660
-msgid "\"options\" property is not a GdaSet object"
-msgstr "“options”属性不是一个 GdaSet 对象"
-
-#: ../libgda/gda-data-model-import.c:937
+#: ../libgda/gda-data-model-import.c:977
#, c-format
msgid "The '%s' option must hold a GType value, ignored."
msgstr "'%s' 选项必须保持为 GType 值，已忽略。"
-#: ../libgda/gda-data-model-import.c:1003
+#: ../libgda/gda-data-model-import.c:1043
#, c-format
msgid "Character conversion at line %d, error: %s"
msgstr "在行 %d 中字符转换，错误：%s"
-#: ../libgda/gda-data-model-import.c:1006
-#: ../libgda/sqlite/gda-sqlite-provider.c:916
+#: ../libgda/gda-data-model-import.c:1046
+#: ../libgda/sqlite/gda-sqlite-provider.c:922
#: ../providers/bdb/gda-bdb-provider.c:209
#: ../tools/browser/common/gdaui-data-import.c:177
#: ../tools/browser/data-manager/data-widget.c:611
msgid "no detail"
msgstr "无细节"
-#: ../libgda/gda-data-model-import.c:1044
+#: ../libgda/gda-data-model-import.c:1086
#, c-format
msgid "Could not convert string '%s' to a '%s' value"
msgstr "无法转换字符串 '%s' 到一个 '%s' 值"
-#: ../libgda/gda-data-model-import.c:1100
+#: ../libgda/gda-data-model-import.c:1142
#, c-format
msgid "Error while parsing CSV file: %s"
msgstr "解析 CSV 文件时出错：%s"
#. error
-#: ../libgda/gda-data-model-import.c:1200
+#: ../libgda/gda-data-model-import.c:1242
msgid "Failed to read node in XML file"
msgstr "在 XML 文件中读取节点失败"
-#: ../libgda/gda-data-model-import.c:1219
+#: ../libgda/gda-data-model-import.c:1261
#, c-format
msgid "Expected <gda_array> node in XML file, got <%s>"
msgstr "在 XML 文件中期望 <gda_array> 节点，但是获得了 <%s>"
-#: ../libgda/gda-data-model-import.c:1265
-#: ../libgda/gda-data-model-import.c:1587
+#: ../libgda/gda-data-model-import.c:1307
+#: ../libgda/gda-data-model-import.c:1629
msgid "No \"gdatype\" attribute specified in <gda_array_field>"
msgstr "在 <gda_array_field> 中没有指定“gdatype”属性"
-#: ../libgda/gda-data-model-import.c:1316
+#: ../libgda/gda-data-model-import.c:1358
msgid "Expected <gda_array_field> in <gda_array>"
msgstr "在 <gda_array> 期望获得 <gda_array_field>"
-#: ../libgda/gda-data-model-import.c:1347
+#: ../libgda/gda-data-model-import.c:1389
#, c-format
msgid "Expected <gda_array_data> in <gda_array>, got <%s>"
msgstr "在 <gda_array> 中期望获得 <gda_array_data>，然而获得了 <%s>"
-#: ../libgda/gda-data-model-import.c:1349
+#: ../libgda/gda-data-model-import.c:1391
msgid "Expected <gda_array_data> in <gda_array>"
msgstr "在 <gda_array> 中期望获得 <gda_array_data>"
-#: ../libgda/gda-data-model-import.c:1361
+#: ../libgda/gda-data-model-import.c:1403
msgid "Can't read the contents of the <gda_array_data> node"
msgstr "无法读取 <gda_array_data> 节点的内容"
-#: ../libgda/gda-data-model-import.c:1410
+#: ../libgda/gda-data-model-import.c:1452
#, c-format
msgid "Expected <gda_array_row> in <gda_array_data>, got <%s>"
msgstr "在 <gda_array_data> 中期望获得 <gda_array_row>，然而获得了 <%s>"
-#: ../libgda/gda-data-model-import.c:1434
+#: ../libgda/gda-data-model-import.c:1476
msgid "Row has too many values (which are ignored)"
msgstr "行有过多的值 (其被忽略)"
-#: ../libgda/gda-data-model-import.c:1481
+#: ../libgda/gda-data-model-import.c:1523
#, c-format
msgid "Could not convert '%s' to a value of type %s"
msgstr "无法将 '%s' 转换为一个 %s 类型的值"
-#: ../libgda/gda-data-model-import.c:1554
+#: ../libgda/gda-data-model-import.c:1596
#, c-format
msgid "Expected <gda_array> node but got <%s>"
msgstr "期望获得 <gda_array> 节点，但是获得了 <%s>"
-#: ../libgda/gda-data-model-import.c:1638
+#: ../libgda/gda-data-model-import.c:1680
msgid "No <gda_array_field> specified in <gda_array>"
msgstr "<gda_array> 中没有指定 <gda_array_field>"
-#: ../libgda/gda-data-model-import.c:1814 ../libgda/gda-data-select.c:3813
+#: ../libgda/gda-data-model-import.c:1856 ../libgda/gda-data-select.c:3814
msgid "Data model does not support random access"
msgstr "数据模型不支持随机访问"
-#: ../libgda/gda-data-model-import.c:1871
+#: ../libgda/gda-data-model-import.c:1913
#, fuzzy, c-format
#| msgid "Row at line %d does not have enough values (which are thus ignored)"
msgid "Row at line %d does not have enough values"
msgstr "第 %d 行(line)的行(row)没有足够的值"
-#: ../libgda/gda-data-model-import.c:1876
+#: ../libgda/gda-data-model-import.c:1918
#, c-format
msgid "Row at line %d does not have enough values, completed with NULL values"
msgstr "%d 行 (line) 的行 (row) 没有足够的值，使用 NULL 值补全"
-#: ../libgda/gda-data-model-import.c:1901
+#: ../libgda/gda-data-model-import.c:1943
#, c-format
msgid "Row at line %d does not have enough values (which are thus ignored)"
msgstr "%d 行 (line) 的行 (row) 没有足够的值 (因此已忽略之)"
@@ -1281,70 +1362,70 @@ msgstr ""
"哑 GdaDataModelLdap 对象：如果您在应用程序中看到此消息，很可能 LDAP 提供程序"
"安装出了问题。无论如何，GdaDataModelLdap 对象将不可用。"
-#: ../libgda/gda-data-pivot.c:493
+#: ../libgda/gda-data-pivot.c:494
#, fuzzy
msgid "Pivot model not populated"
msgstr "Pivot 模型未增加"
-#: ../libgda/gda-data-pivot.c:541 ../libgda/gda-data-pivot.c:553
-#: ../libgda/gda-data-pivot.c:605 ../libgda/gda-data-pivot.c:617
-#: ../libgda/gda-data-pivot.c:671 ../libgda/gda-data-pivot.c:722
-#: ../libgda/gda-data-pivot.c:907 ../libgda/gda-data-pivot.c:923
-#: ../libgda/gda-data-pivot.c:979 ../libgda/gda-data-pivot.c:991
-#: ../libgda/gda-data-pivot.c:1043 ../libgda/gda-data-pivot.c:1055
-#: ../libgda/gda-data-pivot.c:1107 ../libgda/gda-data-pivot.c:1119
-#: ../libgda/gda-data-pivot.c:1177
+#: ../libgda/gda-data-pivot.c:542 ../libgda/gda-data-pivot.c:554
+#: ../libgda/gda-data-pivot.c:606 ../libgda/gda-data-pivot.c:618
+#: ../libgda/gda-data-pivot.c:672 ../libgda/gda-data-pivot.c:723
+#: ../libgda/gda-data-pivot.c:888 ../libgda/gda-data-pivot.c:900
+#: ../libgda/gda-data-pivot.c:952 ../libgda/gda-data-pivot.c:964
+#: ../libgda/gda-data-pivot.c:1016 ../libgda/gda-data-pivot.c:1028
+#: ../libgda/gda-data-pivot.c:1080 ../libgda/gda-data-pivot.c:1092
+#: ../libgda/gda-data-pivot.c:1150
msgid "Integer overflow"
msgstr "整数值溢出"
-#: ../libgda/gda-data-pivot.c:771 ../libgda/gda-data-pivot.c:782
+#: ../libgda/gda-data-pivot.c:772 ../libgda/gda-data-pivot.c:783
msgid "Float value overflow"
msgstr "浮点值溢出"
-#: ../libgda/gda-data-pivot.c:836
+#: ../libgda/gda-data-pivot.c:837
msgid "Double value overflow"
msgstr "双精度值溢出"
-#: ../libgda/gda-data-pivot.c:1166
+#: ../libgda/gda-data-pivot.c:1139
msgid "Inconsistent data type"
msgstr "数据类型不一致"
-#: ../libgda/gda-data-pivot.c:1216
+#: ../libgda/gda-data-pivot.c:1185
msgid "Data type does not support requested computation"
msgstr "数据类型不支持请求的操作"
-#: ../libgda/gda-data-pivot.c:1314 ../libgda/gda-data-pivot.c:1344
-#: ../libgda/gda-data-pivot.c:1442 ../libgda/gda-data-pivot.c:1555
+#: ../libgda/gda-data-pivot.c:1283 ../libgda/gda-data-pivot.c:1313
+#: ../libgda/gda-data-pivot.c:1411 ../libgda/gda-data-pivot.c:1524
#, c-format
msgid "Wrong field format error: %s"
msgstr "错误的字段格式：%s"
-#: ../libgda/gda-data-pivot.c:1328 ../libgda/gda-data-pivot.c:1429
-#: ../libgda/gda-data-pivot.c:1452 ../libgda/gda-data-pivot.c:1542
-#: ../libgda/gda-data-pivot.c:1565 ../libgda/gda-sql-builder.c:728
+#: ../libgda/gda-data-pivot.c:1297 ../libgda/gda-data-pivot.c:1398
+#: ../libgda/gda-data-pivot.c:1421 ../libgda/gda-data-pivot.c:1511
+#: ../libgda/gda-data-pivot.c:1534 ../libgda/gda-sql-builder.c:725
#, c-format
msgid "Wrong field format"
msgstr "错误的字段名格式"
-#: ../libgda/gda-data-pivot.c:1611
+#: ../libgda/gda-data-pivot.c:1580
msgid "No row field defined"
msgstr "没有定义行字段"
-#: ../libgda/gda-data-pivot.c:1658 ../libgda/gda-data-pivot.c:1670
-#: ../libgda/gda-data-pivot.c:1686
+#: ../libgda/gda-data-pivot.c:1627 ../libgda/gda-data-pivot.c:1639
+#: ../libgda/gda-data-pivot.c:1655
msgid "Could not get information from source data model"
msgstr "无法从源数据模型获取信息"
-#: ../libgda/gda-data-pivot.c:2148 ../libgda/gda-data-proxy.c:3081
-#: ../tools/gda-sql.c:3744
+#: ../libgda/gda-data-pivot.c:2117 ../libgda/gda-data-proxy.c:3081
+#: ../tools/gda-sql.c:3159
msgid "Could not create virtual connection"
msgstr "无法创建虚拟连接"
-#: ../libgda/gda-data-pivot.c:2164
+#: ../libgda/gda-data-pivot.c:2133
msgid "No source defined"
msgstr "没有定义源"
-#: ../libgda/gda-data-pivot.c:2182
+#: ../libgda/gda-data-pivot.c:2151
msgid "Invalid source data model (may have incompatible column names)"
msgstr "无效的源数据模型(可能是有不兼容的列名称)"
@@ -1352,7 +1433,7 @@ msgstr "无效的源数据模型(可能是有不兼容的列名称)"
msgid "GdaDataProxy can't handle non random access data models"
msgstr "GdaDataProxy 无法处理非随机访问数据模型"
-#: ../libgda/gda-data-proxy.c:1677 ../libgda/gda-data-proxy.c:4071
+#: ../libgda/gda-data-proxy.c:1677 ../libgda/gda-data-proxy.c:4074
msgid ""
"The first row is an empty row artificially prepended and cannot be removed"
msgstr "第一列是手工添加的空列，不能移除"
@@ -1390,22 +1471,22 @@ msgstr "过滤表达式中有错误"
msgid "Incorrect filter expression"
msgstr "错误的过滤表达式"
-#: ../libgda/gda-data-proxy.c:3806
+#: ../libgda/gda-data-proxy.c:3809
msgid ""
"The first row is an empty row artificially prepended and cannot be altered"
msgstr "第一行是一个人工添加的空行，不能改变"
-#: ../libgda/gda-data-proxy.c:3835 ../libgda/gda-data-proxy.c:3846
+#: ../libgda/gda-data-proxy.c:3838 ../libgda/gda-data-proxy.c:3849
#, c-format
msgid "Wrong value type: expected '%s' and got '%s'"
msgstr "错误的值类型：期望 '%s' 然而获得了 '%s'"
-#: ../libgda/gda-data-proxy.c:3934
+#: ../libgda/gda-data-proxy.c:3937
#, c-format
msgid "Trying to change read-only column: %d"
msgstr "正在尝试更改只读列：%d"
-#: ../libgda/gda-data-proxy.c:3971
+#: ../libgda/gda-data-proxy.c:3974
#, c-format
msgid "Value type mismatch %s instead of %s"
msgstr "值类型失配 %s 而不是 %s"
@@ -1567,395 +1648,392 @@ msgstr "INSERT 语句丢失要插入的值"
msgid "No DELETE statement provided"
msgstr "没有提供 DELETE 语句"
-#: ../libgda/gda-data-select.c:3763
+#: ../libgda/gda-data-select.c:3764
#, c-format
msgid ""
"An error has occurred, the value returned by the \"exec-params\" property "
"will be wrong: %s"
msgstr "已经发生了错误，“exec-params”属性返回的值会是错误的：%s"
-#: ../libgda/gda-data-select.c:3818
-#, fuzzy
+#: ../libgda/gda-data-select.c:3819
#| msgid "Whether data model can be modified"
msgid "Data model has been modified"
-msgstr "数据模型可否修改"
+msgstr "数据模型已修改"
-#: ../libgda/gda-data-select.c:3827
+#: ../libgda/gda-data-select.c:3828
msgid "Data model contains BLOBs"
-msgstr ""
+msgstr "数据模型包含 BLOB"
-#: ../libgda/gda-data-select.c:3838
-#, fuzzy
+#: ../libgda/gda-data-select.c:3839
#| msgid "Can't get the number of rows of data model to compare to"
msgid "Can't get the number of rows of data model"
-msgstr "无法获得作为比较目标的数据模型的行数"
+msgstr "无法获得数据模型的行数"
-#: ../libgda/gda-holder.c:548 ../libgda/gda-set.c:605
+#: ../libgda/gda-holder.c:544 ../libgda/gda-set.c:1183
#, c-format
msgid "Unable to set holder's value: %s"
msgstr "无法设置保持器的值：%s"
-#: ../libgda/gda-holder.c:649
+#: ../libgda/gda-holder.c:645
msgid "The 'g-type' property cannot be changed"
msgstr "'g-type' 属性不能更改。"
-#: ../libgda/gda-holder.c:940
+#: ../libgda/gda-holder.c:936
#, c-format
msgid "Unable to convert string to '%s' type"
msgstr "无法转换字符串到“%s”类型"
-#: ../libgda/gda-holder.c:1003
+#: ../libgda/gda-holder.c:999
msgid ""
"Can't use this method to set value because there is already a static value"
msgstr "无法使用此方法设置值，因为已经有一个静态值"
-#: ../libgda/gda-holder.c:1022 ../libgda/gda-holder.c:1170
+#: ../libgda/gda-holder.c:1018 ../libgda/gda-holder.c:1166
#, c-format
msgid "(%s): Holder does not allow NULL values"
msgstr "(%s)：保持器不允许取空(NULL)值"
-#: ../libgda/gda-holder.c:1029
+#: ../libgda/gda-holder.c:1025
#, fuzzy, c-format
msgid ""
"(%s): Wrong Holder value type, expected type '%s' when value's type is '%s'"
msgstr "(%s)：错误的保持器值类型，应为“%s”类型，而值的类型为 '%s'"
-#: ../libgda/gda-holder.c:1177
+#: ../libgda/gda-holder.c:1173
#, fuzzy, c-format
msgid "(%s): Wrong value type: expected type '%s' when value's type is '%s'"
msgstr "(%s)：错误的值类型：应为“%s”类型，而值的类型为 '%s'"
-#: ../libgda/gda-holder.c:1653
+#: ../libgda/gda-holder.c:1649
#, c-format
msgid ""
"GdaHolder has a gda type (%s) incompatible with source column %d type (%s)"
msgstr "GdaHolder 的 gda 类型(%s)不兼容于来源列 %d 的类型(%s)"
#. break holder's binding because type differ
-#: ../libgda/gda-holder.c:1740
+#: ../libgda/gda-holder.c:1736
#, c-format
msgid ""
"Cannot bind holders if their type is not the same, breaking existing bind "
"where '%s' was bound to '%s'"
msgstr "保持器的类型不同时无法绑定，将断开现有的 '%s' 到 '%s' 的绑定"
-#: ../libgda/gda-holder.c:1791
+#: ../libgda/gda-holder.c:1787
msgid "Cannot bind holders if their type is not the same"
msgstr "保持器类型不同时无法绑定"
-#: ../libgda/gda-holder.c:1954
+#: ../libgda/gda-holder.c:1950
#, fuzzy, c-format
msgid "Could not change GdaHolder to match value change in bound GdaHolder: %s"
msgstr "无法创建类型为 %s 的组件"
-#: ../libgda/gda-init.c:135
+#: ../libgda/gda-init.c:133
msgid "Ignoring attempt to re-initialize GDA library."
msgstr "正在忽略重新初始化 GDA 库的尝试。"
-#: ../libgda/gda-init.c:161
+#: ../libgda/gda-init.c:148
msgid "libgda needs GModule. Finishing..."
msgstr "libgda 需要 GModule。正在终止..."
-#: ../libgda/gda-init.c:212 ../libgda/gda-init.c:233
+#: ../libgda/gda-init.c:199 ../libgda/gda-init.c:220
#, c-format
msgid ""
"Could not parse '%s': XML data import validation will not be performed (some "
"weird errors may occur)"
msgstr "无法解析 %s：将不作 XML 数据导入有效性检查(可能出现了异常的错误)"
-#: ../libgda/gda-init.c:254
+#: ../libgda/gda-init.c:241
#, c-format
msgid ""
"Could not parse '%s': Validation for XML files for server operations will "
"not be performed (some weird errors may occur)"
msgstr "无法解析 %s：将不作 XML 的服务器操作有效性检查(可能出现了异常的错误)"
-#: ../libgda/gda-meta-store.c:642
+#: ../libgda/gda-meta-store.c:654
msgid "Connection string for the internal connection to use"
msgstr "内部连接用的连接字符串"
-#: ../libgda/gda-meta-store.c:645
+#: ../libgda/gda-meta-store.c:657
msgid "Connection object internally used"
msgstr "连接对象被内部使用"
-#: ../libgda/gda-meta-store.c:648
+#: ../libgda/gda-meta-store.c:660
msgid "Catalog in which the database objects will be created"
msgstr "将创建的数据库对象所属的分类"
-#: ../libgda/gda-meta-store.c:651
+#: ../libgda/gda-meta-store.c:663
msgid "Schema in which the database objects will be created"
msgstr "将创建的数据库对象所用的方案"
-#: ../libgda/gda-meta-store.c:800
+#: ../libgda/gda-meta-store.c:812
msgid "Catalog specified but no schema specified, store will not be usable"
msgstr "指定了分类而没有指定方案，将不能保存"
-#: ../libgda/gda-meta-store.c:1134 ../libgda/gda-meta-store.c:1143
-#: ../libgda/gda-meta-store.c:2335 ../libgda/gda-meta-store.c:2344
+#: ../libgda/gda-meta-store.c:1146 ../libgda/gda-meta-store.c:1155
+#: ../libgda/gda-meta-store.c:2349 ../libgda/gda-meta-store.c:2358
msgid "Could not set the internal schema's version"
msgstr "无法设置内部方案版本"
-#: ../libgda/gda-meta-store.c:1512
+#: ../libgda/gda-meta-store.c:1524
msgid "Missing view name from <view> node"
msgstr "<view> 节点中丢失视图名"
-#: ../libgda/gda-meta-store.c:1552
+#: ../libgda/gda-meta-store.c:1564
msgid "Missing view definition from <view> node"
msgstr "从 <view> 节点中丢失查看定义"
-#: ../libgda/gda-meta-store.c:1566
+#: ../libgda/gda-meta-store.c:1578
#, c-format
msgid "View definition contains more than one statement (for view '%s')"
msgstr "视图定义包含多于一个的语句 (视图 '%s')"
-#: ../libgda/gda-meta-store.c:1593
+#: ../libgda/gda-meta-store.c:1605
#, c-format
msgid "View definition is not a selection statement (for view '%s')"
msgstr "视图定义不是一个选择语句 (视图 '%s')"
-#: ../libgda/gda-meta-store.c:1620 ../libgda/gda-meta-struct-io.c:176
+#: ../libgda/gda-meta-store.c:1632 ../libgda/gda-meta-struct-io.c:178
msgid "Missing table name from <table> node"
msgstr "<table> 节点中丢失表名"
-#: ../libgda/gda-meta-store.c:1856
+#: ../libgda/gda-meta-store.c:1868
#, c-format
msgid "Column '%s' already exists and has different characteristics"
msgstr "列 '%s' 已经存在并且有不同的特征"
-#: ../libgda/gda-meta-store.c:1891
+#: ../libgda/gda-meta-store.c:1903
#, c-format
msgid "Missing foreign key's referenced table name (for table '%s')"
msgstr "缺少外键的引用表名称(对于表“%s”)"
-#: ../libgda/gda-meta-store.c:1945
+#: ../libgda/gda-meta-store.c:1957
#, c-format
msgid "Missing foreign key's column name (for table '%s')"
msgstr "缺少外键的列名称(对于表“%s”)"
-#: ../libgda/gda-meta-store.c:1957
+#: ../libgda/gda-meta-store.c:1969
#, c-format
msgid "Column '%s' not found in table '%s'"
msgstr "列 '%s' 没有在表 '%s' 中找到"
-#: ../libgda/gda-meta-store.c:2212 ../libgda/gda-meta-struct.c:1333
+#: ../libgda/gda-meta-store.c:2224 ../libgda/gda-meta-struct.c:1336
#, c-format
msgid "Foreign key column '%s' not found in table '%s'"
msgstr "在表“%2$s”中没有找到外键列“%1$s”"
-#: ../libgda/gda-meta-store.c:2392 ../libgda/gda-meta-store.c:2424
+#: ../libgda/gda-meta-store.c:2406 ../libgda/gda-meta-store.c:2438
#, c-format
msgid "Schema description does not contain the object '%s', check installation"
msgstr "方案不包含对象 '%s'，请检查安装"
-#: ../libgda/gda-meta-store.c:2463
+#: ../libgda/gda-meta-store.c:2477
#, c-format
msgid "Could not find description for column named '%s'"
msgstr "无法找到名为“%s”的列的描述"
-#: ../libgda/gda-meta-store.c:2578 ../libgda/gda-meta-store.c:2589
-#: ../libgda/gda-meta-store.c:2623
+#: ../libgda/gda-meta-store.c:2592 ../libgda/gda-meta-store.c:2603
+#: ../libgda/gda-meta-store.c:2637
msgid "Could not get the internal schema's version"
msgstr "无法获取内部方案版本"
-#: ../libgda/gda-meta-store.c:2747 ../libgda/gda-meta-store.c:2869
-#: ../tools/gda-sql.c:1195
+#: ../libgda/gda-meta-store.c:2761 ../libgda/gda-meta-store.c:2883
+#: ../tools/gda-sql.c:850
msgid "More than one SQL statement"
msgstr "多于一个的 SQL 语句"
-#: ../libgda/gda-meta-store.c:2776 ../libgda/gda-meta-store.c:2897
+#: ../libgda/gda-meta-store.c:2790 ../libgda/gda-meta-store.c:2911
#, c-format
msgid "Parameter '%s' is not present in statement"
msgstr "语句中不存在参数 '%s'"
-#: ../libgda/gda-meta-store.c:2793 ../libgda/gda-meta-store.c:2911
+#: ../libgda/gda-meta-store.c:2807 ../libgda/gda-meta-store.c:2925
#, c-format
msgid "No value set for parameter '%s'"
msgstr "没有为参数 '%s' 设置值"
-#: ../libgda/gda-meta-store.c:3500
+#: ../libgda/gda-meta-store.c:3514
msgid "Data models should have the same number of columns"
msgstr "数据模型应该包含同样数量的列"
-#: ../libgda/gda-meta-store.c:3561 ../libgda/gda-meta-store.c:4608
-#: ../libgda/gda-meta-store.c:4711
+#: ../libgda/gda-meta-store.c:3577 ../libgda/gda-meta-store.c:4624
+#: ../libgda/gda-meta-store.c:4727
#, c-format
msgid "Unknown database object '%s'"
msgstr "未知数据库对象 '%s'"
-#: ../libgda/gda-meta-store.c:3577
+#: ../libgda/gda-meta-store.c:3593
#, c-format
msgid "Could not set value for parameter '%s'"
msgstr "无法为参数 '%s' 设置值"
-#: ../libgda/gda-meta-store.c:3606
+#: ../libgda/gda-meta-store.c:3622
msgid "Could not create SELECT statement"
msgstr "无法创建 SELECT 语句"
-#: ../libgda/gda-meta-store.c:3621
+#: ../libgda/gda-meta-store.c:3637
msgid "Could not create DELETE statement"
msgstr "无法创建 DELETE 语句"
-#: ../libgda/gda-meta-store.c:3671
+#: ../libgda/gda-meta-store.c:3687
msgid "A transaction has already been started"
msgstr "已经开始了一个事务"
-#: ../libgda/gda-meta-store.c:4058
+#: ../libgda/gda-meta-store.c:4074
#, c-format
msgid "Attribute '%s' not found"
msgstr "属性 '%s' 未找到"
-#: ../libgda/gda-meta-store.c:4061
+#: ../libgda/gda-meta-store.c:4077
#, c-format
msgid "Attribute '%s' has %d value"
msgid_plural "Attribute '%s' has %d values"
msgstr[0] "属性 '%s' 的值为 %d"
-#: ../libgda/gda-meta-store.c:4108
+#: ../libgda/gda-meta-store.c:4124
msgid "Attributes names starting with a '_' are reserved for internal usage"
msgstr "以一个 '_' 开头的属性名保留做内部使用"
-#: ../libgda/gda-meta-store.c:4136
+#: ../libgda/gda-meta-store.c:4152
msgid ""
"Could not start a transaction because one already started, this could lead "
"to GdaMetaStore attributes problems"
-msgstr ""
-"无法开始事务，因为已经启动了一个事务；同时进行可能导致 GdaMetaStore 属性问题"
+msgstr "无法开始事务，因为已经启动了一个事务；同时进行可能导致 GdaMetaStore 属性问题"
-#: ../libgda/gda-meta-store.c:4251
+#: ../libgda/gda-meta-store.c:4267
msgid "Could not parse XML description of custom database object to add"
msgstr "无法解析要添加的自定义数据库对象的 XML 描述"
-#: ../libgda/gda-meta-store.c:4265
+#: ../libgda/gda-meta-store.c:4281
msgid "Missing custom database object name"
msgstr "丢失自定义数据库对象名"
-#: ../libgda/gda-meta-store.c:4270
+#: ../libgda/gda-meta-store.c:4286
msgid ""
"Custom database object names starting with a '_' are reserved for internal "
"usage"
msgstr "以一个 '_' 开始的自定义数据库对象名保留作内部使用"
-#: ../libgda/gda-meta-store.c:4368
+#: ../libgda/gda-meta-store.c:4384
msgid "Another object with the same name already exists"
msgstr "有同样名称的另一个对象已经存在"
-#: ../libgda/gda-meta-store.c:4470
+#: ../libgda/gda-meta-store.c:4486
msgid "Missing table name in meta data context"
msgstr "在元数据上下文中丢失表名"
-#: ../libgda/gda-meta-store.c:4497
+#: ../libgda/gda-meta-store.c:4513
msgid "Missing column name in meta data context"
msgstr "在元数据上下文中丢失列名"
-#: ../libgda/gda-meta-store.c:4513
+#: ../libgda/gda-meta-store.c:4529
#, c-format
msgid "Missing condition in meta data context"
msgstr "在元数据上下文中缺少条件"
-#: ../libgda/gda-meta-store.c:4538
+#: ../libgda/gda-meta-store.c:4554
#, c-format
msgid "Malformed condition in meta data context"
msgstr "元数据上下文中的条件损坏"
-#: ../libgda/gda-meta-store.c:4555
+#: ../libgda/gda-meta-store.c:4571
#, c-format
msgid "Unknown column name '%s' in meta data context"
msgstr "元数据上下文中未知的列名 '%s'"
-#: ../libgda/gda-meta-store.c:4577
+#: ../libgda/gda-meta-store.c:4593
msgid "Unknown table in meta data context"
msgstr "元数据上下文中未知的表名"
-#: ../libgda/gda-meta-store.c:4850 ../libgda/gda-meta-store.c:4880
-#: ../libgda/gda-meta-store.c:5069 ../libgda/gda-meta-store.c:5098
-#: ../libgda/gda-meta-struct.c:505 ../libgda/gda-meta-struct.c:520
-#: ../libgda/gda-meta-struct.c:537
+#: ../libgda/gda-meta-store.c:4866 ../libgda/gda-meta-store.c:4896
+#: ../libgda/gda-meta-store.c:5085 ../libgda/gda-meta-store.c:5114
+#: ../libgda/gda-meta-struct.c:506 ../libgda/gda-meta-struct.c:521
+#: ../libgda/gda-meta-struct.c:538
#, c-format
msgid "Could not find object named '%s'"
msgstr "无法找到名为 '%s' 的对象"
-#: ../libgda/gda-meta-store.c:4948 ../libgda/gda-meta-store.c:4967
+#: ../libgda/gda-meta-store.c:4964 ../libgda/gda-meta-store.c:4983
#, c-format
msgid "Could not find column '%s' in table '%s'"
msgstr "在表“%2$s”中找不到列“%1$s”"
-#: ../libgda/gda-meta-struct.c:133
+#: ../libgda/gda-meta-struct.c:134
msgid "GdaMetaStore object to fetch information from"
msgstr "GdaMetaStore 对象用以取回信息，从"
#. To translators: The GdaMetaStruct object computes lists of tables, views,
#. * and some other information, the "Features to compute" allows one to avoid
#. * computing some features which won't be used
-#: ../libgda/gda-meta-struct.c:141
+#: ../libgda/gda-meta-struct.c:142
#, fuzzy
msgid "Features to compute"
msgstr "要计算的功能"
-#: ../libgda/gda-meta-struct.c:843
+#: ../libgda/gda-meta-struct.c:844
#, c-format
msgid ""
"Object %s.%s.%s already exists in GdaMetaStruct and has a different object "
"type"
msgstr "对象 %s.%s.%s 已经存在于 GdaMetaStruct 中并且拥有一个不同的对象类型"
-#: ../libgda/gda-meta-struct.c:869
+#: ../libgda/gda-meta-struct.c:870
#, c-format
msgid "View %s.%s.%s not found in meta store object"
msgstr "在源数据对象中没找到视图 %s.%s.%s"
-#: ../libgda/gda-meta-struct.c:951
+#: ../libgda/gda-meta-struct.c:952
#, c-format
msgid "Table %s.%s.%s not found (or missing columns information)"
msgstr "没有找到表 %s.%s.%s (或者丢失列信息)"
-#: ../libgda/gda-meta-struct.c:1098
+#: ../libgda/gda-meta-struct.c:1099
#, c-format
msgid "Internal GdaMetaStore error: column %s not found"
msgstr "内部 GdaMetaStore 错误：没有找到列 %s"
-#: ../libgda/gda-meta-struct.c:1248
+#: ../libgda/gda-meta-struct.c:1251
#, c-format
msgid ""
"Meta data incoherence in foreign key constraint for table %s.%s.%s "
"referencing table %s.%s.%s"
msgstr "指向表 %4$s.%5$s.%6$s 的表 %1$s.%2$s.%3$s 中的外键约束的元数据不一致"
-#: ../libgda/gda-meta-struct.c:2571
+#: ../libgda/gda-meta-struct.c:2574
msgid "Missing object name in GdaMetaDbObject structure"
msgstr "GdaMetaDbObject 结构中丢失对象名"
-#: ../libgda/gda-meta-struct.c:2596
+#: ../libgda/gda-meta-struct.c:2599
#, c-format
msgid "Database object '%s' already exists"
msgstr "数据库对象 '%s' 已经存在"
-#: ../libgda/gda-meta-struct-io.c:82
+#: ../libgda/gda-meta-struct-io.c:83
#, c-format
msgid "Could not load file '%s'"
msgstr "无法加载文件 '%s'"
-#: ../libgda/gda-meta-struct-io.c:89
+#: ../libgda/gda-meta-struct-io.c:90
#, c-format
msgid "Root node of file '%s' should be <schema>."
msgstr "文件 '%s' 的根节点应该为 <schema>。"
-#: ../libgda/gda-meta-struct-io.c:236
+#: ../libgda/gda-meta-struct-io.c:238
#, c-format
msgid "Missing column name for table '%s'"
msgstr "表 '%s' 丢失列名"
-#: ../libgda/gda-meta-struct-io.c:292
+#: ../libgda/gda-meta-struct-io.c:294
#, c-format
msgid "Missing foreign key's referenced table name for table '%s'"
msgstr "表“%s”缺少外键的引用表名称"
-#: ../libgda/gda-meta-struct-io.c:304 ../libgda/gda-meta-struct-io.c:311
-#: ../libgda/gda-meta-struct-io.c:318
+#: ../libgda/gda-meta-struct-io.c:306 ../libgda/gda-meta-struct-io.c:313
+#: ../libgda/gda-meta-struct-io.c:320
#, c-format
msgid "Invalid referenced table name '%s'"
msgstr "无效的引用表名 '%s'"
-#: ../libgda/gda-meta-struct-io.c:358
+#: ../libgda/gda-meta-struct-io.c:360
#, c-format
msgid "Missing foreign key's column name for table '%s'"
msgstr "表“%s”缺少外键的列名称"
@@ -2037,11 +2115,11 @@ msgstr "丢失 '%s' 必须的值"
msgid "Unspecified table name"
msgstr "未指定的表名"
-#: ../libgda/gda-server-operation.c:2728
+#: ../libgda/gda-server-operation.c:2729
msgid "Invalid type"
msgstr "无效类型"
-#: ../libgda/gda-server-operation.c:2822
+#: ../libgda/gda-server-operation.c:2834
msgid "CREATE TABLE operation is not supported by the database server"
msgstr "数据库服务器不支持 CREATE TABLE 操作"
@@ -2055,7 +2133,7 @@ msgstr "提供者 %s 已创建了一个 GdaServerOperation，但 '%s' 没有节
msgid "Provider %s created a GdaServerOperation with wrong node type for '%s'"
msgstr "提供者 %s 已创建了一个 GdaServerProvider，但 '%s' 的节点类型错误"
-#: ../libgda/gda-server-provider.c:948 ../libgda/gda-server-provider.c:982
+#: ../libgda/gda-server-provider.c:951 ../libgda/gda-server-provider.c:985
#, c-format
msgid ""
"GdaServerProvider object implements the %s virtual method but does not "
@@ -2065,82 +2143,82 @@ msgstr ""
"GdaServerProvider 对象实现了 %s 虚方法，但没有实现 %s，请向 http://bugzilla.";
"gnome.org/ 报告“libgda”产品的缺陷。"
-#: ../libgda/gda-set.c:597 ../libgda/gda-set.c:702
+#: ../libgda/gda-set.c:1175 ../libgda/gda-set.c:1280
#, c-format
msgid "%s() does not handle values of type '%s'."
msgstr "%s() 不处理类型 '%s' 的值。"
-#: ../libgda/gda-set.c:652
+#: ../libgda/gda-set.c:1230
#, c-format
msgid "GdaHolder with ID '%s' not found in set"
msgstr "ID 为 '%s' 的 GdaHolder 没有在集合中找到"
-#: ../libgda/gda-set.c:836
+#: ../libgda/gda-set.c:1414
#, c-format
msgid "Spec's root node != 'data-set-spec': '%s'"
msgstr "规范的根节点 != “data-set-spec”：“%s”"
-#: ../libgda/gda-set.c:875
+#: ../libgda/gda-set.c:1453
#, c-format
msgid "Missing node <parameters>: '%s'"
msgstr "丢失节点 <parameters>：'%s'"
-#: ../libgda/gda-set.c:1092
+#: ../libgda/gda-set.c:1674
msgid "Data set does not allow modifications"
msgstr "数据集合不支持修改"
-#: ../libgda/gda-set.c:1358
+#: ../libgda/gda-set.c:1935
msgid "GdaHolder needs to have an ID"
msgstr "GdaHolder 需要有一个 ID"
-#: ../libgda/gda-set.c:1472
+#: ../libgda/gda-set.c:2041
msgid "One or more values are invalid"
msgstr "一个或多个值是非法的"
-#: ../libgda/gda-set.c:1691 ../libgda/gda-set.c:1704
+#: ../libgda/gda-set.c:2290 ../libgda/gda-set.c:2303
msgid ""
"Replacing data model must have the same characteristics as the data model it "
"replaces"
msgstr "用于替换的数据模型必需与它所替换的数据模型具有相同的特征"
-#: ../libgda/gda-sql-builder.c:296 ../libgda/gda-sql-builder.c:1401
+#: ../libgda/gda-sql-builder.c:297 ../libgda/gda-sql-builder.c:1397
#, fuzzy, c-format
msgid "Unknown part ID %u"
msgstr "未知部件 ID %u"
-#: ../libgda/gda-sql-builder.c:300
+#: ../libgda/gda-sql-builder.c:301
#, fuzzy
msgid "Unknown part type"
msgstr "未知部件类型"
-#: ../libgda/gda-sql-builder.c:344
+#: ../libgda/gda-sql-builder.c:345
msgid "SqlBuilder is empty"
msgstr "SqlBuilder 为空"
-#: ../libgda/gda-sql-builder.c:419 ../libgda/gda-sql-builder.c:476
-#: ../libgda/gda-sql-builder.c:505 ../libgda/gda-sql-builder.c:633
-#: ../libgda/gda-sql-builder.c:675 ../libgda/gda-sql-builder.c:737
-#: ../libgda/gda-sql-builder.c:797 ../libgda/gda-sql-builder.c:1163
-#: ../libgda/gda-sql-builder.c:1247 ../libgda/gda-sql-builder.c:1292
-#: ../libgda/gda-sql-builder.c:1383 ../libgda/gda-sql-builder.c:1434
-#: ../libgda/gda-sql-builder.c:1476 ../libgda/gda-sql-builder.c:1523
-#: ../libgda/gda-sql-builder.c:1573 ../libgda/gda-sql-builder.c:1609
-#: ../libgda/gda-sql-builder.c:1776 ../libgda/gda-sql-builder.c:1802
-#: ../libgda/gda-sql-builder.c:1837
+#: ../libgda/gda-sql-builder.c:420 ../libgda/gda-sql-builder.c:477
+#: ../libgda/gda-sql-builder.c:506 ../libgda/gda-sql-builder.c:630
+#: ../libgda/gda-sql-builder.c:672 ../libgda/gda-sql-builder.c:734
+#: ../libgda/gda-sql-builder.c:794 ../libgda/gda-sql-builder.c:1159
+#: ../libgda/gda-sql-builder.c:1243 ../libgda/gda-sql-builder.c:1288
+#: ../libgda/gda-sql-builder.c:1379 ../libgda/gda-sql-builder.c:1430
+#: ../libgda/gda-sql-builder.c:1472 ../libgda/gda-sql-builder.c:1519
+#: ../libgda/gda-sql-builder.c:1569 ../libgda/gda-sql-builder.c:1605
+#: ../libgda/gda-sql-builder.c:1773 ../libgda/gda-sql-builder.c:1799
+#: ../libgda/gda-sql-builder.c:1834
msgid "Wrong statement type"
msgstr "错误的语句类型"
-#: ../libgda/gda-sql-builder.c:604
+#: ../libgda/gda-sql-builder.c:601
#, c-format
msgid "Could not convert value to type '%s', value not defined"
msgstr "无法将值转换为“%s”类型，值没有定义"
-#: ../libgda/gda-sql-builder.c:1314
+#: ../libgda/gda-sql-builder.c:1310
#, fuzzy, c-format
msgid "Unknown left part target ID %u"
msgstr "未知的左侧目标部件 ID %u"
-#: ../libgda/gda-sql-builder.c:1319
+#: ../libgda/gda-sql-builder.c:1315
#, fuzzy, c-format
msgid "Unknown right part target ID %u"
msgstr "未知的右侧部件目标 ID %u"
@@ -2168,47 +2246,47 @@ msgstr "丢失 SQL 代码"
msgid "No data handler for type '%s'"
msgstr "没有类型 '%s' 的数据处理程序"
-#: ../libgda/gda-statement.c:1341
+#: ../libgda/gda-statement.c:1378
#, c-format
msgid "Wrong parameter type for '%s': expected type '%s' and got '%s'"
msgstr "'%s' 错误的参数类型：期望类型 '%s' 然而获得了 '%s'"
-#: ../libgda/gda-statement.c:1353
+#: ../libgda/gda-statement.c:1390
#, c-format
msgid "Missing parameter '%s'"
msgstr "丢失参数 '%s'"
-#: ../libgda/gda-statement.c:1365 ../libgda/sqlite/gda-sqlite-provider.c:3059
-#: ../providers/jdbc/gda-jdbc-provider.c:1370
-#: ../providers/mysql/gda-mysql-provider.c:2268
-#: ../providers/postgres/gda-postgres-provider.c:1966
-#: ../providers/web/gda-web-provider.c:1525
+#: ../libgda/gda-statement.c:1402 ../libgda/sqlite/gda-sqlite-provider.c:3113
+#: ../providers/jdbc/gda-jdbc-provider.c:1506
+#: ../providers/mysql/gda-mysql-provider.c:2356
+#: ../providers/postgres/gda-postgres-provider.c:2150
+#: ../providers/web/gda-web-provider.c:1526
#, c-format
msgid "Parameter '%s' is invalid"
msgstr "参数 '%s' 无效"
-#: ../libgda/gda-statement.c:1411
+#: ../libgda/gda-statement.c:1448
msgid "Unnamed parameter"
msgstr "未命名的参数"
-#: ../libgda/gda-statement.c:1687
+#: ../libgda/gda-statement.c:1724
msgid "Malformed table name"
msgstr "错误的表名"
-#: ../libgda/gda-statement.c:2179
+#: ../libgda/gda-statement.c:2222
msgid "Join is not in a FROM statement"
msgstr "Join 不在 FROM 语句中"
-#: ../libgda/gda-statement.c:2186
+#: ../libgda/gda-statement.c:2229
#, fuzzy
msgid "Could not find target the join is for"
msgstr "找不到联合(join)的目标"
-#: ../libgda/gda-tree.c:174
+#: ../libgda/gda-tree.c:175
msgid "Tells if the GdaTree is a list or a tree"
msgstr "如果 GdaTree 是列表或树时，则声明"
-#: ../libgda/gda-tree.c:768 ../libgda/gda-tree.c:776
+#: ../libgda/gda-tree.c:769 ../libgda/gda-tree.c:777
#, c-format
msgid "Path format error: %s"
msgstr "路径格式错误：%s"
@@ -2258,10 +2336,12 @@ msgid ""
msgstr "无法绑定 SELECT 语句的参数 '%s' 到提供者参数：%s"
#: ../libgda/gda-tree-mgr-select.c:300
-#: ../libgda-report/engine/gda-report-engine.c:612
-#: ../libgda-report/engine/gda-report-engine.c:639 ../tools/gda-sql.c:984
-#: ../tools/gda-sql.c:1175 ../tools/gda-sql.c:5565 ../tools/gda-sql.c:5717
-#: ../tools/gda-sql.c:5815 ../tools/gda-sql.c:5909 ../tools/gda-sql.c:6004
+#: ../libgda-report/engine/gda-report-engine.c:614
+#: ../libgda-report/engine/gda-report-engine.c:641 ../tools/gda-sql.c:796
+#: ../tools/gda-sql.c:830 ../tools/gda-sql.c:3083 ../tools/gda-sql.c:4884
+#: ../tools/gda-sql.c:5036 ../tools/gda-sql.c:5133 ../tools/gda-sql.c:5226
+#: ../tools/gda-sql.c:5321
+#, c-format
msgid "No connection specified"
msgstr "没有指定连接"
@@ -2333,15 +2413,37 @@ msgid "Can't rewrite statement which is not INSERT or UPDATE"
msgstr "无法重写除 INSERT 或 UPDATE 外的语句"
#: ../libgda/gda-util.c:1781 ../libgda/gda-util.c:1838
-#: ../libgda/gda-util.c:1878 ../libgda/sqlite/gda-sqlite-provider.c:3040
-#: ../providers/jdbc/gda-jdbc-provider.c:1341
-#: ../providers/mysql/gda-mysql-provider.c:2248
-#: ../providers/postgres/gda-postgres-provider.c:1948
-#: ../providers/web/gda-web-provider.c:1507
+#: ../libgda/gda-util.c:1878 ../libgda/sqlite/gda-sqlite-provider.c:3094
+#: ../providers/jdbc/gda-jdbc-provider.c:1477
+#: ../providers/mysql/gda-mysql-provider.c:2336
+#: ../providers/postgres/gda-postgres-provider.c:2132
+#: ../providers/web/gda-web-provider.c:1508
#, c-format
msgid "Missing parameter '%s' to execute query"
msgstr "要执行查询，丢失参数 '%s'"
+#: ../libgda/gda-util.c:3065
+msgid "The 'first', 'second' and 'third' arguments must be different"
+msgstr "“first”、“second”和“third”参数必须不同"
+
+#: ../libgda/gda-util.c:3070
+#, fuzzy, c-format
+#| msgid "Invalid user name"
+msgid "Invalid separator '%c'"
+msgstr "无效的用户名"
+
+#: ../libgda/gda-util.c:3072
+#, fuzzy
+#| msgid "Invalid user name"
+msgid "Invalid null separator"
+msgstr "无效的用户名"
+
+#: ../libgda/gda-util.c:3110 ../libgda/gda-util.c:3125
+#: ../libgda/gda-util.c:3140
+#, fuzzy, c-format
+msgid "Unknown GDateDMY value %u"
+msgstr "未知部件 ID %u"
+
#: ../libgda/gda-xa-transaction.c:162
msgid "Global transaction ID can not have more than 64 bytes"
msgstr "全局事务标识不能超过 64 字节"
@@ -2372,53 +2474,31 @@ msgstr "无法解除注册不是使用 GdaXaTransaction 对象注册的连接"
msgid "Provider error: %s method not implemented for provider %s"
msgstr "提供者错误：%s 方法没有为提供者 %s 实现"
-#: ../libgda/handlers/gda-handler-bin.c:122
-msgid "Binary handler"
-msgstr "二进制处理程序"
-
-#: ../libgda/handlers/gda-handler-bin.c:129
+#: ../libgda/handlers/gda-handler-bin.c:127
msgid "Binary representation"
msgstr "二进制表示"
#: ../libgda/handlers/gda-handler-boolean.c:122
-#: ../libgda/sqlite/gda-sqlite-handler-boolean.c:118
-#: ../providers/mysql/gda-mysql-handler-boolean.c:118
-msgid "Boolean values handler"
-msgstr "布尔值处理程序"
-
-#: ../libgda/handlers/gda-handler-boolean.c:128
msgid "Boolean representation"
msgstr "布尔型表示"
-#: ../libgda/handlers/gda-handler-numerical.c:141
+#: ../libgda/handlers/gda-handler-numerical.c:139
msgid "Numerical representation"
msgstr "数值表示"
-#: ../libgda/handlers/gda-handler-string.c:126
-msgid "Strings handler"
-msgstr "字符串处理程序"
-
-#: ../libgda/handlers/gda-handler-string.c:131
+#: ../libgda/handlers/gda-handler-string.c:122
msgid "InternalString"
msgstr "内部字符串"
-#: ../libgda/handlers/gda-handler-string.c:132
+#: ../libgda/handlers/gda-handler-string.c:123
msgid "Strings representation"
msgstr "字符串类型表示"
-#: ../libgda/handlers/gda-handler-time.c:149
-msgid "Time and Date handler"
-msgstr "时间和日期处理程序"
-
-#: ../libgda/handlers/gda-handler-time.c:174
+#: ../libgda/handlers/gda-handler-time.c:175
msgid "Time, Date and TimeStamp representation"
msgstr "时间、日期和时间戳表示"
#: ../libgda/handlers/gda-handler-type.c:119
-msgid "Gda type handler"
-msgstr "Gda 类型处理程序"
-
-#: ../libgda/handlers/gda-handler-type.c:125
msgid "Gda type representation"
msgstr "Gda 类型表示"
@@ -2438,73 +2518,73 @@ msgstr "无法为 HTML 找到 DocBook XSL 样式表"
msgid "Could not find the DocBook XSL stylesheet for Formatting Objects"
msgstr "无法为格式化对象找到 DocBook XSL 样式表"
-#: ../libgda-report/engine/gda-report-engine.c:334
+#: ../libgda-report/engine/gda-report-engine.c:336
#, c-format
msgid "Object type '%s' cannot be declared in this context"
msgstr "对象类型 '%s' 不能在此上下文中声明"
-#: ../libgda-report/engine/gda-report-engine.c:342
+#: ../libgda-report/engine/gda-report-engine.c:344
#, c-format
msgid "An object with the '%s' name has already been declared"
msgstr "一个名为 '%s' 的对象有一个已经声明的对象"
-#: ../libgda-report/engine/gda-report-engine.c:377
+#: ../libgda-report/engine/gda-report-engine.c:379
#, c-format
msgid "Object type '%s' cannot be requested in this context"
msgstr "不能在此上下文中请求对象类型 '%s'"
-#: ../libgda-report/engine/gda-report-engine.c:596
+#: ../libgda-report/engine/gda-report-engine.c:598
#, c-format
msgid "Unknown query '%s'"
msgstr "未知的查询 '%s'"
-#: ../libgda-report/engine/gda-report-engine.c:607
-#: ../libgda-report/engine/gda-report-engine.c:634 ../tools/gda-sql.c:3466
-#: ../tools/gda-sql.c:3548 ../tools/gda-sql.c:3649
+#: ../libgda-report/engine/gda-report-engine.c:609
+#: ../libgda-report/engine/gda-report-engine.c:636 ../tools/gda-sql.c:2858
+#: ../tools/gda-sql.c:3094
#, c-format
msgid "No connection named '%s' found"
msgstr "没有找到名为 '%s' 的连接"
-#: ../libgda-report/engine/gda-report-engine.c:679
+#: ../libgda-report/engine/gda-report-engine.c:681
msgid "Query is not specified (not named and not defined)"
msgstr "查询没有指定 (未命名且未定义)"
-#: ../libgda-report/engine/gda-report-engine.c:844
-#: ../libgda-report/engine/gda-report-engine.c:995
-#: ../libgda-report/engine/gda-report-engine.c:1052
+#: ../libgda-report/engine/gda-report-engine.c:846
+#: ../libgda-report/engine/gda-report-engine.c:997
+#: ../libgda-report/engine/gda-report-engine.c:1054
#, c-format
msgid "Unknown parameter '%s'"
msgstr "未知的参数 '%s'"
-#: ../libgda-report/engine/gda-report-engine.c:870
+#: ../libgda-report/engine/gda-report-engine.c:872
msgid "Parameter name not specified"
msgstr "参数名未指定"
-#: ../libgda-report/engine/gda-report-engine.c:920
+#: ../libgda-report/engine/gda-report-engine.c:922
msgid "No expression specified"
msgstr "没有指定的表达式"
-#: ../libgda-report/engine/gda-report-engine.c:943
+#: ../libgda-report/engine/gda-report-engine.c:945
#, c-format
msgid "Cannot cast value from type '%s' to type '%s'"
msgstr "无法将值从“%s”类型转换为“%s”类型"
-#: ../libgda-report/engine/gda-report-engine.c:1081
+#: ../libgda-report/engine/gda-report-engine.c:1083
#, c-format
msgid "Cannot cast parameter from type '%s' to type '%s'"
msgstr "无法将参数从“%s”类型转换为“%s”类型"
-#: ../libgda-report/engine/gda-report-engine.c:1174
+#: ../libgda-report/engine/gda-report-engine.c:1176
#, c-format
msgid "Expression '%s' should return exactly one value"
msgstr "表达式 '%s' 返回且只返回一个值"
-#: ../libgda-report/engine/gda-report-engine.c:1214
+#: ../libgda-report/engine/gda-report-engine.c:1216
msgid "Binary data"
msgstr "二进制数据"
-#: ../libgda-report/engine/rt-parser.c:1220
-#: ../libgda-report/engine/rt-parser.c:1426
+#: ../libgda-report/engine/rt-parser.c:1222
+#: ../libgda-report/engine/rt-parser.c:1428
msgid "link"
msgstr "链接"
@@ -2535,34 +2615,31 @@ msgstr "报告文档不处理 %s 输出"
msgid "Table to create must have at least one row"
msgstr "要创建的表必须至少有一行"
-#: ../libgda/sqlite/gda-sqlite-handler-bin.c:120
-msgid "SQlite binary handler"
-msgstr "SQlite 二进制处理程序"
-
-#: ../libgda/sqlite/gda-sqlite-handler-bin.c:126
-msgid "SQlite binary representation"
+#: ../libgda/sqlite/gda-sqlite-handler-bin.c:119
+#| msgid "SQlite binary representation"
+msgid "SQLite binary representation"
msgstr "SQLite 二进制表示"
-#: ../libgda/sqlite/gda-sqlite-handler-boolean.c:124
+#: ../libgda/sqlite/gda-sqlite-handler-boolean.c:117
msgid "Sqlite boolean representation"
msgstr "Sqlite 布尔型表示"
# 怀疑此处 is 是 in
-#: ../libgda/sqlite/gda-sqlite-provider.c:121
-#: ../libgda/sqlite/gda-sqlite-provider.c:179
+#: ../libgda/sqlite/gda-sqlite-provider.c:118
+#: ../libgda/sqlite/gda-sqlite-provider.c:176
#, c-format
msgid "Parameter '%s' not found is statement"
msgstr "语句中没有找到参数“%s”"
-#: ../libgda/sqlite/gda-sqlite-provider.c:135
-#: ../libgda/sqlite/gda-sqlite-provider.c:151
-#: ../libgda/sqlite/gda-sqlite-provider.c:193
-#: ../libgda/sqlite/gda-sqlite-provider.c:209
+#: ../libgda/sqlite/gda-sqlite-provider.c:132
+#: ../libgda/sqlite/gda-sqlite-provider.c:148
+#: ../libgda/sqlite/gda-sqlite-provider.c:190
+#: ../libgda/sqlite/gda-sqlite-provider.c:206
#, c-format
msgid "No column name to associate to parameter '%s'"
msgstr "没有要与参数“%s”关联的列名"
-#: ../libgda/sqlite/gda-sqlite-provider.c:219
+#: ../libgda/sqlite/gda-sqlite-provider.c:216
msgid "Binding a BLOB for this type of statement is not supported"
msgstr "不支持为语句的此类型绑定 BLOB"
@@ -2570,26 +2647,26 @@ msgstr "不支持为语句的此类型绑定 BLOB"
msgid "Can't find libsqlite3."
msgstr "无法找到 libsqlite3。"
-#: ../libgda/sqlite/gda-sqlite-provider.c:739
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:364
-#: ../libgda/thread-wrapper/gda-thread-provider.c:512
+#: ../libgda/sqlite/gda-sqlite-provider.c:740
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:374
+#: ../libgda/thread-wrapper/gda-thread-provider.c:513
#: ../providers/bdb/gda-bdb-provider.c:154
-#: ../providers/jdbc/gda-jdbc-provider.c:356
+#: ../providers/jdbc/gda-jdbc-provider.c:480
#: ../providers/ldap/gda-ldap-provider.c:353
#: ../providers/mdb/gda-mdb-provider.c:236
-#: ../providers/mysql/gda-mysql-provider.c:590
-#: ../providers/postgres/gda-postgres-provider.c:408
-#: ../providers/web/gda-web-provider.c:342
+#: ../providers/mysql/gda-mysql-provider.c:639
+#: ../providers/postgres/gda-postgres-provider.c:554
+#: ../providers/web/gda-web-provider.c:343
msgid "Provider does not support asynchronous connection open"
msgstr "提供者不支持打开异步连接"
-#: ../libgda/sqlite/gda-sqlite-provider.c:767
+#: ../libgda/sqlite/gda-sqlite-provider.c:769
#: ../providers/mdb/gda-mdb-provider.c:252
msgid "The connection string must contain DB_DIR and DB_NAME values"
msgstr "连接字符串必须含有 DB_DIR 和 DB_NAME 值"
-#: ../libgda/sqlite/gda-sqlite-provider.c:794
-#: ../libgda/sqlite/gda-sqlite-provider.c:802
+#: ../libgda/sqlite/gda-sqlite-provider.c:796
+#: ../libgda/sqlite/gda-sqlite-provider.c:804
#, c-format
msgid ""
"The connection string format has changed: replace URI with DB_DIR (the path "
@@ -2599,39 +2676,39 @@ msgstr ""
"连接字符串格式已经更改：使用 DB_DIR (数据库文件的路径) 和 DB_NAME (没有结尾 "
"'%s' 的数据库文件) 替代 URI。"
-#: ../libgda/sqlite/gda-sqlite-provider.c:817
+#: ../libgda/sqlite/gda-sqlite-provider.c:819
#: ../providers/mdb/gda-mdb-provider.c:294
msgid ""
"The DB_DIR part of the connection string must point to a valid directory"
msgstr "连接字符串的 DB_DIR 部分必须指向一个合法目录"
-#: ../libgda/sqlite/gda-sqlite-provider.c:875
+#: ../libgda/sqlite/gda-sqlite-provider.c:881
msgid "Wrong encryption passphrase"
msgstr "错误的加密口令"
-#: ../libgda/sqlite/gda-sqlite-provider.c:896
+#: ../libgda/sqlite/gda-sqlite-provider.c:902
msgid "Extension loading is not supported"
msgstr "不支持加载扩展"
-#: ../libgda/sqlite/gda-sqlite-provider.c:915
+#: ../libgda/sqlite/gda-sqlite-provider.c:921
#, c-format
msgid "Could not set empty_result_callbacks SQLite option: %s"
msgstr "无法设定 empty_result_callbacks SQLite 选项：%s"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1006
-#: ../libgda/sqlite/gda-sqlite-provider.c:1026
+#: ../libgda/sqlite/gda-sqlite-provider.c:1012
+#: ../libgda/sqlite/gda-sqlite-provider.c:1032
#, c-format
msgid "Could not register function '%s'"
msgstr "无法注册函数“%s”"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1045
+#: ../libgda/sqlite/gda-sqlite-provider.c:1051
#, fuzzy, c-format
#| msgid "Could not find the '%s' program"
msgid "Could not define the %s collation"
msgstr "无法定义排序规则 %s"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1203
-#: ../libgda/sqlite/gda-sqlite-provider.c:1245
+#: ../libgda/sqlite/gda-sqlite-provider.c:1209
+#: ../libgda/sqlite/gda-sqlite-provider.c:1251
#: ../libgda-ui/data-entries/plugins/libmain.c:89
#: ../libgda-ui/data-entries/plugins/libmain.c:126
#: ../libgda-ui/data-entries/plugins/libmain.c:152
@@ -2639,93 +2716,99 @@ msgstr "无法定义排序规则 %s"
#: ../libgda-ui/data-entries/plugins/libmain.c:189
#: ../libgda-ui/data-entries/plugins/libmain.c:282
#: ../libgda-ui/data-entries/plugins/libmain.c:307
-#: ../providers/mysql/gda-mysql-provider.c:835
-#: ../providers/mysql/gda-mysql-provider.c:877
-#: ../providers/postgres/gda-postgres-provider.c:747
-#: ../providers/postgres/gda-postgres-provider.c:803
+#: ../providers/mysql/gda-mysql-provider.c:887
+#: ../providers/mysql/gda-mysql-provider.c:929
+#: ../providers/postgres/gda-postgres-provider.c:906
+#: ../providers/postgres/gda-postgres-provider.c:962
#, c-format
msgid "Missing spec. file '%s'"
msgstr "缺少规范文件“%s”"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1373
-#: ../libgda/sqlite/gda-sqlite-provider.c:1384
-#: ../libgda/sqlite/gda-sqlite-provider.c:1398
-#: ../libgda/sqlite/gda-sqlite-provider.c:1409
+#: ../libgda/sqlite/gda-sqlite-provider.c:1386
+#: ../libgda/sqlite/gda-sqlite-provider.c:1397
+#: ../libgda/sqlite/gda-sqlite-provider.c:1411
+#: ../libgda/sqlite/gda-sqlite-provider.c:1422
msgid "Error initializing database with passphrase"
msgstr "使用口令初始化数据库出错"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1451
+#: ../libgda/sqlite/gda-sqlite-provider.c:1464
msgid "Missing database name or directory"
msgstr "丢失数据库名或目录"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1477
-#: ../providers/postgres/gda-postgres-provider.c:1004
-#: ../providers/postgres/gda-postgres-provider.c:1005
+#: ../libgda/sqlite/gda-sqlite-provider.c:1490
+#: ../providers/postgres/gda-postgres-provider.c:1163
+#: ../providers/postgres/gda-postgres-provider.c:1164
msgid "Transactions are not supported in read-only mode"
msgstr "只读模式中不支持事务"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1872
+#: ../libgda/sqlite/gda-sqlite-provider.c:1887
#, fuzzy
msgid "SQLite does not support specifying fields to apply DISTINCT clause on"
msgstr "SQLite 不支持指定应用 DISTINCT 条文的字段"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1919
-#: ../libgda/sqlite/gda-sqlite-provider.c:1929
+#: ../libgda/sqlite/gda-sqlite-provider.c:1934
+#: ../libgda/sqlite/gda-sqlite-provider.c:1944
#, c-format
msgid "'%s' compound not supported by SQLite"
msgstr "SQLite 不支持“%s”复合"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2536
-#: ../providers/jdbc/gda-jdbc-provider.c:1122
-#: ../providers/postgres/gda-postgres-provider.c:1540
-#: ../providers/web/gda-web-provider.c:1270
+#: ../libgda/sqlite/gda-sqlite-provider.c:2042
+#, fuzzy
+#| msgid "Operation not supported\n"
+msgid "ILIKE operation not supported"
+msgstr "操作不支持\n"
+
+#: ../libgda/sqlite/gda-sqlite-provider.c:2589
+#: ../providers/jdbc/gda-jdbc-provider.c:1258
+#: ../providers/postgres/gda-postgres-provider.c:1717
+#: ../providers/web/gda-web-provider.c:1271
msgid "Unnamed parameter is not allowed in prepared statements"
msgstr "在准备就绪语句中不允许有未命名的参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2649
-#: ../libgda/sqlite/gda-sqlite-provider.c:2661
-#: ../providers/mysql/gda-mysql-provider.c:1980
-#: ../providers/postgres/gda-postgres-provider.c:1683
+#: ../libgda/sqlite/gda-sqlite-provider.c:2702
+#: ../libgda/sqlite/gda-sqlite-provider.c:2714
+#: ../providers/mysql/gda-mysql-provider.c:2068
+#: ../providers/postgres/gda-postgres-provider.c:1865
#, fuzzy, c-format
#| msgid "Can't build SELECT statement to get last inserted row: %s)"
msgid "Can't build SELECT statement to get last inserted row: %s"
msgstr "无法构建 SELECT 语句以获取最后插入的行：%s)"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2683
-#: ../providers/mysql/gda-mysql-provider.c:1995
-#: ../providers/postgres/gda-postgres-provider.c:1698
+#: ../libgda/sqlite/gda-sqlite-provider.c:2736
+#: ../providers/mysql/gda-mysql-provider.c:2083
+#: ../providers/postgres/gda-postgres-provider.c:1880
#, c-format
msgid "Can't execute SELECT statement to get last inserted row: %s"
msgstr "无法执行 SELECT 语句以获取最新插入的行：%s"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2696
-#: ../providers/mysql/gda-mysql-provider.c:2008
-#: ../providers/postgres/gda-postgres-provider.c:1711
+#: ../libgda/sqlite/gda-sqlite-provider.c:2749
+#: ../providers/mysql/gda-mysql-provider.c:2096
+#: ../providers/postgres/gda-postgres-provider.c:1893
msgid "SELECT statement to get last inserted row did not return any row"
msgstr "用以获取最新插入行的 SELECT 语句没有返回任何行"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2700
-#: ../providers/mysql/gda-mysql-provider.c:2012
-#: ../providers/postgres/gda-postgres-provider.c:1715
+#: ../libgda/sqlite/gda-sqlite-provider.c:2753
+#: ../providers/mysql/gda-mysql-provider.c:2100
+#: ../providers/postgres/gda-postgres-provider.c:1897
#, c-format
msgid "SELECT statement to get last inserted row returned too many (%d) rows"
msgstr "获取最新插入行的 SELECT 语句返回了过多 (%d) 的行"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2765
+#: ../libgda/sqlite/gda-sqlite-provider.c:2818
msgid "Prepared statement has no associated GdaStatement"
msgstr "准备就绪语句没有相关联的 GdaStatement"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2805
-#: ../libgda/sqlite/gda-sqlite-provider.c:2842
+#: ../libgda/sqlite/gda-sqlite-provider.c:2858
+#: ../libgda/sqlite/gda-sqlite-provider.c:2895
msgid "Can't create SQLite BLOB handle"
msgstr "无法创建 SQLite BLOB 句柄"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2809
-#: ../libgda/sqlite/gda-sqlite-provider.c:2847
+#: ../libgda/sqlite/gda-sqlite-provider.c:2862
+#: ../libgda/sqlite/gda-sqlite-provider.c:2900
msgid "Can't write to SQLite's BLOB"
msgstr "无法创建 SQLite BLOB"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2832
+#: ../libgda/sqlite/gda-sqlite-provider.c:2885
#, c-format
msgid ""
"Can't obtain SQLite BLOB handle (reported type is '%s'), please report this "
@@ -2734,112 +2817,112 @@ msgstr ""
"无法获取 SQLite BLOB 句柄 (报告的类型是 '%s')，请在 http://bugzilla.gnome.";
"org/ 上为“libgda”产品报告这个 bug。"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2857
+#: ../libgda/sqlite/gda-sqlite-provider.c:2910
msgid "Can't identify the ROWID of the blob to fill"
msgstr "无法识别要填充的 blob 的 ROWID"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2905
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:438
-#: ../providers/jdbc/gda-jdbc-provider.c:1220
-#: ../providers/ldap/gda-ldap-provider.c:803
-#: ../providers/mysql/gda-mysql-provider.c:2101
-#: ../providers/postgres/gda-postgres-provider.c:1810
-#: ../providers/web/gda-web-provider.c:1403
+#: ../libgda/sqlite/gda-sqlite-provider.c:2958
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:448
+#: ../providers/jdbc/gda-jdbc-provider.c:1356
+#: ../providers/ldap/gda-ldap-provider.c:801
+#: ../providers/mysql/gda-mysql-provider.c:2189
+#: ../providers/postgres/gda-postgres-provider.c:1992
+#: ../providers/web/gda-web-provider.c:1404
msgid "Provider does not support asynchronous statement execution"
msgstr "提供者不支持异步语句执行"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2973
-#: ../tools/browser/mgr-favorites.c:248 ../tools/browser/mgr-favorites.c:290
+#: ../libgda/sqlite/gda-sqlite-provider.c:3027
+#: ../tools/browser/mgr-favorites.c:249 ../tools/browser/mgr-favorites.c:291
msgid "Empty statement"
msgstr "空语句"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3015
-#: ../libgda/sqlite/gda-sqlite-provider.c:3018
-#: ../providers/jdbc/gda-jdbc-provider.c:1307
-#: ../providers/jdbc/gda-jdbc-provider.c:1310
-#: ../providers/mysql/gda-mysql-provider.c:2223
-#: ../providers/mysql/gda-mysql-provider.c:2226
-#: ../providers/postgres/gda-postgres-provider.c:1924
-#: ../providers/postgres/gda-postgres-provider.c:1927
-#: ../providers/web/gda-web-provider.c:1481
-#: ../providers/web/gda-web-provider.c:1484
+#: ../libgda/sqlite/gda-sqlite-provider.c:3069
+#: ../libgda/sqlite/gda-sqlite-provider.c:3072
+#: ../providers/jdbc/gda-jdbc-provider.c:1443
+#: ../providers/jdbc/gda-jdbc-provider.c:1446
+#: ../providers/mysql/gda-mysql-provider.c:2311
+#: ../providers/mysql/gda-mysql-provider.c:2314
+#: ../providers/postgres/gda-postgres-provider.c:2108
+#: ../providers/postgres/gda-postgres-provider.c:2111
+#: ../providers/web/gda-web-provider.c:1482
+#: ../providers/web/gda-web-provider.c:1485
msgid "Missing parameter(s) to execute query"
msgstr "丢失要执行查询的参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3078
-#: ../providers/jdbc/gda-jdbc-provider.c:1389
-#: ../providers/mysql/gda-mysql-provider.c:2287
-#: ../providers/postgres/gda-postgres-provider.c:1985
-#: ../providers/web/gda-web-provider.c:1548
+#: ../libgda/sqlite/gda-sqlite-provider.c:3132
+#: ../providers/jdbc/gda-jdbc-provider.c:1525
+#: ../providers/mysql/gda-mysql-provider.c:2375
+#: ../providers/postgres/gda-postgres-provider.c:2169
+#: ../providers/web/gda-web-provider.c:1549
msgid "Can't rewrite statement handle default values"
msgstr "无法重写语句句柄的默认值"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3202
-#: ../providers/mysql/gda-mysql-provider.c:2539
+#: ../libgda/sqlite/gda-sqlite-provider.c:3252
+#: ../providers/mysql/gda-mysql-provider.c:2643
msgid "Can't get BLOB's length"
msgstr "无法获得 BLOB 的长度"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3204
-#: ../providers/mysql/gda-mysql-provider.c:2541
+#: ../libgda/sqlite/gda-sqlite-provider.c:3254
+#: ../providers/mysql/gda-mysql-provider.c:2645
msgid "BLOB is too big"
msgstr "BLOB 过大"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3286
+#: ../libgda/sqlite/gda-sqlite-provider.c:3368
#, c-format
msgid "Non handled data type '%s'"
msgstr "没有已处理的数据类型 '%s'"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3353
+#: ../libgda/sqlite/gda-sqlite-provider.c:3435
msgid "Could not start transaction to create BLOB"
msgstr "无法启动事务来创建 BLOB"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3518
-#: ../libgda/sqlite/gda-sqlite-provider.c:3539
-#: ../libgda/sqlite/gda-sqlite-provider.c:3630
-#: ../libgda/sqlite/gda-sqlite-provider.c:3650
-#: ../libgda/sqlite/gda-sqlite-provider.c:3673
+#: ../libgda/sqlite/gda-sqlite-provider.c:3600
+#: ../libgda/sqlite/gda-sqlite-provider.c:3621
+#: ../libgda/sqlite/gda-sqlite-provider.c:3712
+#: ../libgda/sqlite/gda-sqlite-provider.c:3732
+#: ../libgda/sqlite/gda-sqlite-provider.c:3755
msgid "Function requires one argument"
msgstr "函数要求一个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3571
-#: ../libgda/sqlite/gda-sqlite-provider.c:3705
+#: ../libgda/sqlite/gda-sqlite-provider.c:3653
+#: ../libgda/sqlite/gda-sqlite-provider.c:3787
msgid "Function requires two arguments"
msgstr "函数要求两个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3610
+#: ../libgda/sqlite/gda-sqlite-provider.c:3692
msgid "Function requires one or two arguments"
msgstr "函数要求一到两个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3745
-#: ../libgda/sqlite/gda-sqlite-provider.c:3852
+#: ../libgda/sqlite/gda-sqlite-provider.c:3827
+#: ../libgda/sqlite/gda-sqlite-provider.c:3934
msgid "Function requires two or three arguments"
msgstr "函数要求两到三个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3799
+#: ../libgda/sqlite/gda-sqlite-provider.c:3881
#, c-format
msgid "SQLite regexp '%s' error:"
msgstr "SQLite 正则 %s 出错："
-#: ../libgda/sqlite/gda-sqlite-provider.c:3800
+#: ../libgda/sqlite/gda-sqlite-provider.c:3882
msgid "Invalid regular expression"
msgstr "正则表达式无效"
#: ../libgda/sqlite/gda-sqlite-recordset.c:256
-#: ../providers/jdbc/gda-jdbc-recordset.c:282
+#: ../providers/jdbc/gda-jdbc-recordset.c:297
#: ../providers/mysql/gda-mysql-recordset.c:444
#: ../providers/mysql/gda-mysql-recordset.c:580
#: ../providers/postgres/gda-postgres-recordset.c:295
-#: ../providers/web/gda-web-recordset.c:186
+#: ../providers/web/gda-web-recordset.c:185
#, c-format
msgid "Column %d out of range (0-%d), ignoring its specified type"
msgstr "列 %d 超出范围 (0-%d)，忽略其指定的类型"
#: ../libgda/sqlite/gda-sqlite-recordset.c:434
#: ../libgda/sqlite/gda-sqlite-recordset.c:447
-#: ../libgda/sqlite/gda-sqlite-recordset.c:578
-#: ../libgda/sqlite/gda-sqlite-recordset.c:595
-#: ../libgda/sqlite/gda-sqlite-recordset.c:608
-#: ../libgda/sqlite/gda-sqlite-recordset.c:621
+#: ../libgda/sqlite/gda-sqlite-recordset.c:584
+#: ../libgda/sqlite/gda-sqlite-recordset.c:597
+#: ../libgda/sqlite/gda-sqlite-recordset.c:610
+#: ../libgda/sqlite/gda-sqlite-recordset.c:623
msgid "Integer value is too big"
msgstr "整数值过大"
@@ -2849,66 +2932,64 @@ msgstr "无法打开 BLOB"
#: ../libgda/sqlite/gda-sqlite-recordset.c:534
#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:672
-#: ../providers/postgres/gda-postgres-recordset.c:618
#, c-format
msgid "Invalid date '%s' (date format should be YYYY-MM-DD)"
msgstr "无效的日期 '%s' (日期格式必须为 YYYY-MM-DD)"
#: ../libgda/sqlite/gda-sqlite-recordset.c:549
#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:688
-#: ../providers/postgres/gda-postgres-recordset.c:629
+#: ../providers/postgres/gda-postgres-recordset.c:638
#, c-format
msgid "Invalid time '%s' (time format should be HH:MM:SS[.ms])"
msgstr "无效的时间 '%s' (时间格式必须是 HH:MM:SS[.ms])"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:564
+#: ../libgda/sqlite/gda-sqlite-recordset.c:567
#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:704
-#: ../providers/postgres/gda-postgres-recordset.c:671
#, c-format
msgid "Invalid timestamp '%s' (format should be YYYY-MM-DD HH:MM:SS[.ms])"
msgstr "无效的时间戳 '%s' (格式应该是 YYYY-MM-DD HH:MM:SS[.ms])"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:656
+#: ../libgda/sqlite/gda-sqlite-recordset.c:658
msgid "SQLite provider fatal internal error"
msgstr "SQLite 提供者致命内部错误"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:664
+#: ../libgda/sqlite/gda-sqlite-recordset.c:666
msgid "Truncated data"
msgstr "截断的数据"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:717
-#: ../providers/jdbc/gda-jdbc-recordset.c:493
+#: ../libgda/sqlite/gda-sqlite-recordset.c:719
+#: ../providers/jdbc/gda-jdbc-recordset.c:508
msgid "Requested row could not be found"
msgstr "找不到请求的行"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:748
-#: ../providers/jdbc/gda-jdbc-recordset.c:531
+#: ../libgda/sqlite/gda-sqlite-recordset.c:750
+#: ../providers/jdbc/gda-jdbc-recordset.c:546
msgid "Can't set iterator on requested row"
msgstr "无法在请求的行上设置迭代器"
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:126
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:127
#, c-format
msgid "Error storing list of created LDAP tables: %s"
msgstr "保存创建的 LDAP 表的列表失败：%s"
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:203
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:204
msgid "File used to store startup data"
msgstr "用于存储启动数据的文件"
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:248
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:249
#, c-format
msgid "Error recreating LDAP tables: %s"
msgstr "重建 LDAP 表出错：%s"
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:773
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:774
msgid "Can't remove non LDAP virtual table"
msgstr "无法移除非 LDAP 的虚拟表"
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:821
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:822
msgid "Can't describe non LDAP virtual table"
msgstr "无法描述非 LDAP 的虚拟表"
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:828
+#: ../libgda/sqlite/virtual/gda-ldap-connection.c:829
msgid "Unknown LDAP virtual table"
msgstr "未知的 LDAP 虚拟表"
@@ -2938,152 +3019,152 @@ msgstr "整数值超出边界"
msgid "Blob constraints are not handled in virtual table condition"
msgstr "Boolean 约束在虚拟表条件下不能处理"
-#: ../libgda/sqlite/virtual/gda-virtual-connection.c:152
-#: ../libgda/sqlite/virtual/gda-virtual-connection.c:192
+#: ../libgda/sqlite/virtual/gda-virtual-connection.c:150
+#: ../libgda/sqlite/virtual/gda-virtual-connection.c:190
msgid ""
"Internal error: virtual provider does not implement the create_operation() "
"virtual method"
msgstr "内部错误：虚拟提供者没有实现 create_operation() 虚拟方法"
-#: ../libgda/sqlite/virtual/gda-virtual-connection.c:237
+#: ../libgda/sqlite/virtual/gda-virtual-connection.c:235
msgid "Internal error: invalid provider handle"
msgstr "内部错误：无效的提供者句柄"
#. wrong usage!
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:532
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:542
msgid "Wrong usage of Libgda's virtual tables"
msgstr "Libgda 的虚拟表用法错误"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:540
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:550
msgid "Data model must have at least one column"
msgstr "数据模型必须至少有一列"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:557
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:567
msgid "Could not compute virtual table's columns"
msgstr "无法计算虚拟表列"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:580
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:590
#, c-format
msgid "Can't get data model description for column %d"
msgstr "无法为列 %d 获取数据模型描述"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:632
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:642
#, c-format
msgid "Can't get data model's column type for column %d"
msgstr "无法获取列 %d 的数据模型的列类型"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:693
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:703
#, c-format
msgid "Can't declare virtual table (%s)"
msgstr "无法声明虚拟表 (%s)"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:830
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:840
msgid "Internal SQLite error: no data to iterate on"
msgstr "内部 SQLite 错误：无可迭代的数据"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:927
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:947
#, c-format
msgid "Could not find requested value at row %d and col %d"
msgstr "在第 %d 行第 %d 列找不到请求的值"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:949
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:969
msgid "Column not found"
msgstr "列未找到"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1422
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1442
msgid "No statement specified to modify the data"
msgstr "没有指定修改数据的语句"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1429
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1449
msgid "Invalid statement specified to modify the data"
msgstr "指定的用于修改数据的语句无效"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1449
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1486
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1494
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1469
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1506
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1514
msgid "Invalid parameter in statement to modify the data"
msgstr "提供的用于修改数据的语句中的参数无效"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1526
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1546
#, c-format
msgid "Failed to modify data: %s"
msgstr "修改数据失败：%s"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1608
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1628
msgid "Data model representing the table is read only"
msgstr "代表表的数据模型为只读"
-#: ../libgda/sql-parser/gda-sql-parser.c:639
-#: ../libgda/sql-parser/gda-sql-parser.c:730
+#: ../libgda/sql-parser/gda-sql-parser.c:646
+#: ../libgda/sql-parser/gda-sql-parser.c:737
msgid "SQL code does not contain any statement"
msgstr "SQL 代码不含有任何语句"
-#: ../libgda/sql-parser/gda-sql-parser.c:813
+#: ../libgda/sql-parser/gda-sql-parser.c:820
#, c-format
msgid "Syntax error at line %d, column %d"
msgstr "%d 行，%d 列中语法错误"
-#: ../libgda/sql-parser/gda-sql-parser.c:826
+#: ../libgda/sql-parser/gda-sql-parser.c:833
#, c-format
msgid "Overflow error at line %d, column %d"
msgstr "行 %d 列 %d 处溢出错误"
-#: ../libgda/sql-parser/gda-statement-struct.c:582
+#: ../libgda/sql-parser/gda-statement-struct.c:580
msgid "GdaSqlField is not part of an INSERT or UPDATE statement"
msgstr "GdaSqlField 不是 INSERT 或 UPDATE 语句的一部分"
-#: ../libgda/sql-parser/gda-statement-struct.c:595
+#: ../libgda/sql-parser/gda-statement-struct.c:593
msgid "Missing table in statement"
msgstr "语句中缺少表"
-#: ../libgda/sql-parser/gda-statement-struct.c:615
-#: ../libgda/sql-parser/gda-statement-struct.c:843
+#: ../libgda/sql-parser/gda-statement-struct.c:613
+#: ../libgda/sql-parser/gda-statement-struct.c:841
#, c-format
msgid "Column '%s' not found"
msgstr "没有找到列 '%s'"
-#: ../libgda/sql-parser/gda-statement-struct.c:661
-#: ../libgda/sql-parser/gda-statement-struct.c:776
+#: ../libgda/sql-parser/gda-statement-struct.c:659
+#: ../libgda/sql-parser/gda-statement-struct.c:774
msgid "GdaSqlSelectField is not part of a SELECT statement"
msgstr "GdaSqlSelectField 不是 SELECT 语句的一部分"
-#: ../libgda/sql-parser/gda-statement-struct.c:724
+#: ../libgda/sql-parser/gda-statement-struct.c:722
msgid "Missing table name in statement"
msgstr "语句中丢失表名"
-#: ../libgda/sql-parser/gda-statement-struct.c:732
-#: ../libgda/sql-parser/gda-statement-struct.c:825
-#: ../libgda/sql-parser/gda-statement-struct.c:870
+#: ../libgda/sql-parser/gda-statement-struct.c:730
+#: ../libgda/sql-parser/gda-statement-struct.c:823
+#: ../libgda/sql-parser/gda-statement-struct.c:868
#, c-format
msgid "Table '%s' not found"
msgstr "没有找到表 '%s'"
-#: ../libgda/sql-parser/gda-statement-struct.c:798
-#: ../libgda/sql-parser/gda-statement-struct.c:813
-#: ../tools/browser/browser-connection.c:2116
-#: ../tools/browser/browser-connection.c:2170
+#: ../libgda/sql-parser/gda-statement-struct.c:796
+#: ../libgda/sql-parser/gda-statement-struct.c:811
+#: ../tools/browser/browser-connection.c:2107
+#: ../tools/browser/browser-connection.c:2161
#, c-format
msgid "Could not identify table for field '%s'"
msgstr "无法为字段 '%s' 确定表"
-#: ../libgda/sql-parser/gda-statement-struct.c:1000
+#: ../libgda/sql-parser/gda-statement-struct.c:998
msgid "Expression can't have both a type cast and a parameter specification"
msgstr "表达式不能同时进行类型转换和参数指定"
-#: ../libgda/sql-parser/gda-statement-struct.c:1010
-#: ../libgda/sql-parser/gda-statement-struct.c:1023
-#: ../libgda/sql-parser/gda-statement-struct.c:1036
+#: ../libgda/sql-parser/gda-statement-struct.c:1008
+#: ../libgda/sql-parser/gda-statement-struct.c:1021
+#: ../libgda/sql-parser/gda-statement-struct.c:1034
#, c-format
msgid "'%s' is not a valid identifier"
msgstr "'%s' 不是有效的标识符"
-#: ../libgda/sql-parser/gda-statement-struct.c:1013
-#: ../libgda/sql-parser/gda-statement-struct.c:1026
-#: ../libgda/sql-parser/gda-statement-struct.c:1039
+#: ../libgda/sql-parser/gda-statement-struct.c:1011
+#: ../libgda/sql-parser/gda-statement-struct.c:1024
+#: ../libgda/sql-parser/gda-statement-struct.c:1037
msgid "Empty identifier"
msgstr "空标识符"
-#: ../libgda/sql-parser/gda-statement-struct.c:1048
+#: ../libgda/sql-parser/gda-statement-struct.c:1046
msgid "Operation has no operand"
msgstr "操作没有操作数"
@@ -3126,33 +3207,33 @@ msgstr "空 FROM 条文"
msgid "Select field is not in a SELECT statement"
msgstr "SELECT 语句中没有选择字段"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:227
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:234
msgid "COMPOUND statement contains an undefined COMPOUND statement"
msgstr "COMPOUND 语句包含一个未定义的 COMPOUND 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:236
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:275
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:243
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:282
msgid "COMPOUND statement contains an undefined SELECT statement"
msgstr "COMPOUND 语句包含一个未定义的 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:245
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:287
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:252
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:294
msgid "COMPOUND statement contains a non SELECT statement"
msgstr "COMPOUND 语句包含一个非 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:259
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:266
msgid "COMPOUND statement does not contain any SELECT statement"
msgstr "COMPOUND 语句不包含任何 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:265
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:272
msgid "COMPOUND statement only contains one SELECT statement"
msgstr "COMPOUND 语句只包含一个 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:295
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:302
msgid "COMPOUND statement contains an empty SELECT statement"
msgstr "COMPOUND 语句包含一个空 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:301
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:308
msgid "All statements in a COMPOUND must have the same number of columns"
msgstr "COMPOUND 语句中的所有语句必须汉语一定数量的列"
@@ -3201,49 +3282,49 @@ msgstr "SELECT 不能含有不带限制的限制偏移"
msgid "Multiple targets named or aliased '%s'"
msgstr "有多个名字或别名为 '%s' 的目标"
-#: ../libgda/sql-parser/gda-statement-struct-update.c:284
+#: ../libgda/sql-parser/gda-statement-struct-update.c:290
msgid "UPDATE statement needs a table to update data"
msgstr "UPDATE 语句需要一个要更新数据的表"
-#: ../libgda/sql-parser/gda-statement-struct-update.c:290
+#: ../libgda/sql-parser/gda-statement-struct-update.c:296
msgid ""
"UPDATE statement does not have the same number of target columns and "
"expressions"
msgstr "UPDATE 语句的目标列数目和表达式数目不一致"
-#: ../libgda/sql-parser/gda-statement-struct-update.c:296
+#: ../libgda/sql-parser/gda-statement-struct-update.c:302
msgid "UPDATE statement does not have any target columns to update"
msgstr "UPDATE 语句没有任何目标列可更新"
-#: ../libgda/thread-wrapper/gda-thread-provider.c:876
-#: ../libgda/thread-wrapper/gda-thread-provider.c:931
-#: ../libgda/thread-wrapper/gda-thread-provider.c:994
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1051
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1108
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1157
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1206
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1255
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1304
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1852
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1903
-#: ../libgda/thread-wrapper/gda-thread-provider.c:1953
-#: ../libgda/thread-wrapper/gda-thread-provider.c:2004
-#: ../libgda/thread-wrapper/gda-thread-provider.c:2054
-#: ../libgda/thread-wrapper/gda-thread-provider.c:2105
+#: ../libgda/thread-wrapper/gda-thread-provider.c:877
+#: ../libgda/thread-wrapper/gda-thread-provider.c:932
+#: ../libgda/thread-wrapper/gda-thread-provider.c:995
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1052
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1109
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1158
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1207
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1256
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1305
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1853
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1904
+#: ../libgda/thread-wrapper/gda-thread-provider.c:1954
+#: ../libgda/thread-wrapper/gda-thread-provider.c:2005
+#: ../libgda/thread-wrapper/gda-thread-provider.c:2055
+#: ../libgda/thread-wrapper/gda-thread-provider.c:2106
msgid "A connection is required"
msgstr "需要一个连接"
-#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1616
-#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1727
+#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1449
msgid "Signal does not exist\n"
msgstr "信号不存在\n"
-#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1625
+#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1458
msgid "Signal to connect to must not have a return value\n"
msgstr "要连接到的信号不能有返回值\n"
-#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1710
-#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1794
+#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1531
+#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1544
+#: ../libgda/thread-wrapper/gda-thread-wrapper.c:1599
#, c-format
msgid "Signal %lu does not exist"
msgstr "信号 %lu 不存在"
@@ -3254,7 +3335,7 @@ msgstr "选择要加载的文件"
#: ../libgda-ui/data-entries/common-bin.c:79
#: ../libgda-ui/data-entries/plugins/common-pict.c:422
-#: ../libgda-ui/gdaui-rt-editor.c:742
+#: ../libgda-ui/gdaui-rt-editor.c:730
#, c-format
msgid ""
"Could not load the contents of '%s':\n"
@@ -3301,13 +3382,13 @@ msgid "Data size"
msgstr "数据大小"
#: ../libgda-ui/data-entries/common-bin.c:302
-#: ../providers/ldap/gda-ldap-provider.c:983
-#: ../providers/mysql/gda-mysql-provider.c:635
-#: ../providers/mysql/gda-mysql-provider.c:669
+#: ../providers/ldap/gda-ldap-provider.c:1003
+#: ../providers/mysql/gda-mysql-provider.c:686
+#: ../providers/mysql/gda-mysql-provider.c:721
#: ../providers/mysql/gda-mysql-util.c:63
-#: ../tools/browser/ldap-browser/entry-properties.c:585
-#: ../tools/browser/schema-browser/table-columns.c:516
-#: ../tools/browser/support.c:446 ../tools/tools-utils.c:35
+#: ../tools/browser/ldap-browser/entry-properties.c:586
+#: ../tools/browser/schema-browser/table-columns.c:517
+#: ../tools/browser/support.c:446 ../tools/tool-utils.c:35
msgid "Unknown"
msgstr "未知"
@@ -3334,10 +3415,11 @@ msgstr "数据类型"
#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:187
#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c:168
#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:183
-#: ../libgda-ui/gdaui-basic-form.c:848 ../libgda-ui/gdaui-basic-form.c:883
-#: ../libgda-ui/gdaui-raw-grid.c:783 ../providers/ldap/gda-ldap-provider.c:997
-#: ../tools/config-info.c:122 ../tools/config-info.c:291
-#: ../tools/gda-sql.c:3867 ../tools/gda-sql.c:4668 ../tools/gda-sql.c:6058
+#: ../libgda-ui/gdaui-basic-form.c:834 ../libgda-ui/gdaui-basic-form.c:870
+#: ../libgda-ui/gdaui-raw-grid.c:785
+#: ../providers/ldap/gda-ldap-provider.c:1017 ../tools/config-info.c:122
+#: ../tools/config-info.c:291 ../tools/gda-sql.c:3278 ../tools/gda-sql.c:3995
+#: ../tools/gda-sql.c:5375
msgid "Value"
msgstr "值"
@@ -3415,7 +3497,7 @@ msgid "Invalid UTF-8 format!"
msgstr "无效的 UTF-8 格式！"
#. format tooltip
-#: ../libgda-ui/data-entries/gdaui-entry-common-time.c:1014
+#: ../libgda-ui/data-entries/gdaui-entry-common-time.c:1007
msgid "Format is hh:mm:ss"
msgstr "格式为 hh:mm:ss"
@@ -3443,7 +3525,7 @@ msgstr "货币符号"
msgid "A currency symbol"
msgstr "货币符号"
-#: ../libgda-ui/data-entries/gdaui-entry-shell.c:273
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:238
#, fuzzy, c-format
msgid ""
"Widget of class '%s' does not have any associated GdaDataHandler, (to be set "
@@ -3452,15 +3534,15 @@ msgstr ""
"类“%s”的控件没有任何关联的 GdaDataHandler(可使用“handler”属性设置)，可能会有"
"一些异常行为"
-#: ../libgda-ui/data-entries/gdaui-entry-shell.c:429
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:394
msgid "Value is NULL"
msgstr "值为 NULL"
-#: ../libgda-ui/data-entries/gdaui-entry-shell.c:435
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:400
msgid "Value will be determined by default"
msgstr "值将由默认决定"
-#: ../libgda-ui/data-entries/gdaui-entry-shell.c:441
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:406
msgid "Value is invalid"
msgstr "值无效"
@@ -3500,19 +3582,19 @@ msgstr "%s 以未知格式的字符串开头"
msgid "Type %s is not numerical"
msgstr "类型 %s 不是数值型"
-#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:281
+#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:282
#, c-format
msgid "Decimal separator cannot be the '%c' character"
msgstr "小数分隔符不能是 '%c' 字符"
-#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:290
+#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:292
#, c-format
msgid "Decimal thousands cannot be the '%c' character"
msgstr "千位分隔符不能是 '%c' 字符"
#: ../libgda-ui/data-entries/plugins/common-pict.c:106
#: ../libgda-ui/data-entries/plugins/common-pict.c:121
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:417
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:416
msgid "Empty data"
msgstr "空数据"
@@ -3552,7 +3634,7 @@ msgid "_Save image"
msgstr "保存图像(_S)"
#: ../libgda-ui/data-entries/plugins/common-pict.c:360
-#: ../libgda-ui/gdaui-rt-editor.c:701
+#: ../libgda-ui/gdaui-rt-editor.c:689
msgid "Select image to load"
msgstr "选择要加载的图像"
@@ -3629,24 +3711,24 @@ msgstr "变量"
msgid "No idea what it is"
msgstr "不知这是什么"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-cidr.c:261
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-cidr.c:259
msgid "Set to host mask"
msgstr "设置为主机掩码"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-cidr.c:270
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-cidr.c:268
#, c-format
msgid "Set to class %c network"
msgstr "设为 %c 类网络"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:196
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:194
msgid "Choose a file"
msgstr "选择一个文件"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:198
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:196
msgid "Choose a directory"
msgstr "选择目录"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:237
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:235
msgid "Choose"
msgstr "选择"
@@ -3697,8 +3779,7 @@ msgstr "掩码"
msgid ""
"Writing mask for corresponding characters in format ('_': writable, '-':"
"writable, removed from actual value, ' ': not writable)"
-msgstr ""
-"格式中对应字符的写掩码('_'：可写，'-'：可写，从实际值中移除，' '：不可写)"
+msgstr "格式中对应字符的写掩码('_'：可写，'-'：可写，从实际值中移除，' '：不可写)"
#: ../libgda-ui/data-entries/plugins/gdaui-entry-password.xml.in.h:1
#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in.h:1
@@ -3718,7 +3799,7 @@ msgstr "MD5 校验和"
msgid "No encoding"
msgstr "无编码"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:259
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:258
msgid "No data to display"
msgstr "没有要显示的数据"
@@ -3774,10 +3855,10 @@ msgstr "在单词之间断行"
msgid "Break lines in between words or graphemes"
msgstr "在单词或字素之间断行"
-#: ../libgda-ui/data/server_operation.glade.h:1 ../tools/gda-sql.c:2352
-#: ../tools/gda-sql.c:2485 ../tools/gda-sql.c:2498 ../tools/gda-sql.c:2511
-#: ../tools/gda-sql.c:2628 ../tools/gda-sql.c:2641 ../tools/gda-sql.c:2654
-#: ../tools/gda-sql.c:2667 ../tools/gda-sql.c:3027
+#: ../libgda-ui/data/server_operation.glade.h:1 ../tools/gda-sql.c:2007
+#: ../tools/gda-sql.c:2097 ../tools/gda-sql.c:2107 ../tools/gda-sql.c:2116
+#: ../tools/gda-sql.c:2193 ../tools/gda-sql.c:2201 ../tools/gda-sql.c:2209
+#: ../tools/gda-sql.c:2218
msgid "General"
msgstr "一般"
@@ -3786,8 +3867,8 @@ msgid "hello"
msgstr "hello"
#: ../libgda-ui/data/server_operation.glade.h:3
-#: ../tools/browser/common/fk-declare.c:256
-#: ../tools/browser/schema-browser/table-info.c:378
+#: ../tools/browser/common/fk-declare.c:255
+#: ../tools/browser/schema-browser/table-info.c:379
msgid "Columns"
msgstr "列"
@@ -3838,81 +3919,80 @@ msgstr ""
"<i>demo_parser</i> 对象由框架创建，并且\n"
"所有演示条目均可使用。"
-#: ../libgda-ui/gdaui-basic-form.c:293
+#: ../libgda-ui/gdaui-basic-form.c:291
msgid ""
"Pointer to an XML layout specification (as an xmlNodePtr to a <gdaui_form> "
"node)"
msgstr "指向 XML 布局规范 (作为到 <gdaui_form> 节点的 xmlNodePtr)"
-#: ../libgda-ui/gdaui-basic-form.c:297
+#: ../libgda-ui/gdaui-basic-form.c:295
msgid "List of parameters to show in the form"
msgstr "将显示在表单中的参数列表"
-#: ../libgda-ui/gdaui-basic-form.c:311
+#: ../libgda-ui/gdaui-basic-form.c:309
msgid "Show Entry actions"
msgstr "显示记录操作"
-#: ../libgda-ui/gdaui-basic-form.c:316
+#: ../libgda-ui/gdaui-basic-form.c:314
#, fuzzy
msgid "Entries Auto-default"
msgstr "记录自动默认值"
-#: ../libgda-ui/gdaui-basic-form.c:321
+#: ../libgda-ui/gdaui-basic-form.c:319
msgid "TRUE if expanding the form vertically makes sense"
msgstr "若纵向扩展表单有意义则为 TRUE"
-#: ../libgda-ui/gdaui-basic-form.c:345
+#: ../libgda-ui/gdaui-basic-form.c:343
msgid "Shown data entries"
msgstr "已显示的数据集"
-#: ../libgda-ui/gdaui-basic-form.c:969 ../libgda-ui/gdaui-raw-grid.c:824
-#: ../libgda-ui/gdaui-raw-grid.c:2885 ../libgda-ui/gdaui-raw-grid.c:2940
+#: ../libgda-ui/gdaui-basic-form.c:958 ../libgda-ui/gdaui-raw-grid.c:826
+#: ../libgda-ui/gdaui-raw-grid.c:2902 ../libgda-ui/gdaui-raw-grid.c:2957
#, c-format
msgid "The '%s' attribute should be a G_TYPE_STRING value"
msgstr "“%s”属性应为 G_TYPE_STRING 值"
-#: ../libgda-ui/gdaui-basic-form.c:1926
+#: ../libgda-ui/gdaui-basic-form.c:1894
msgid "Can't find data entry for GdaHolder"
msgstr "无法为 GdaHolder 找到数据记录"
-#: ../libgda-ui/gdaui-basic-form.c:2186
+#: ../libgda-ui/gdaui-basic-form.c:2155
msgid "Values to be defined"
msgstr "要定义的值"
-#: ../libgda-ui/gdaui-basic-form.c:2259 ../libgda-ui/gdaui-raw-grid.c:2712
+#: ../libgda-ui/gdaui-basic-form.c:2227 ../libgda-ui/gdaui-raw-grid.c:2729
#, c-format
msgid "'%s' document not parsed successfully"
msgstr "“%s”文档解析未成功"
-#: ../libgda-ui/gdaui-basic-form.c:2269 ../libgda-ui/gdaui-raw-grid.c:2722
+#: ../libgda-ui/gdaui-basic-form.c:2237 ../libgda-ui/gdaui-raw-grid.c:2739
#, c-format
msgid ""
"'%s' DTD not parsed successfully. XML data layout validation will not be "
"performed (some errors may occur)"
-msgstr ""
-"“%s” DTD 没有解析成功。将不执行 XML 数据布局有效性检查(可能出现某些错误)"
+msgstr "“%s” DTD 没有解析成功。将不执行 XML 数据布局有效性检查(可能出现某些错误)"
-#: ../libgda-ui/gdaui-basic-form.c:2401
+#: ../libgda-ui/gdaui-basic-form.c:2369
#, fuzzy
msgid ""
"size group was not taken into account using "
"gdaui_basic_form_add_to_size_group()"
msgstr "使用了 gdaui_basic_form_add_to_size_group()，没有计入尺寸组"
-#: ../libgda-ui/gdaui-cloud.c:246 ../libgda-ui/gdaui-cloud.c:979
+#: ../libgda-ui/gdaui-cloud.c:247 ../libgda-ui/gdaui-cloud.c:981
#, c-format
msgid "Wrong column type for label: expecting a string and got a %s"
msgstr "标签的列类型错误：应为字符串，但得到了 %s"
-#: ../libgda-ui/gdaui-cloud.c:1072 ../tools/browser/common/objects-cloud.c:459
+#: ../libgda-ui/gdaui-cloud.c:1074 ../tools/browser/common/objects-cloud.c:459
msgid "Find:"
msgstr "查找："
-#: ../libgda-ui/gdaui-combo.c:126
+#: ../libgda-ui/gdaui-combo.c:131
msgid "The data model to display"
msgstr "要显示的数据模型"
-#: ../libgda-ui/gdaui-combo.c:130
+#: ../libgda-ui/gdaui-combo.c:135
msgid "Display popup as list"
msgstr "以列表显示弹出项目"
@@ -3920,15 +4000,15 @@ msgstr "以列表显示弹出项目"
msgid "Filter failed:"
msgstr "过滤器失败："
-#: ../libgda-ui/gdaui-data-filter.c:212
+#: ../libgda-ui/gdaui-data-filter.c:210
msgid "Filter"
msgstr "过滤器"
-#: ../libgda-ui/gdaui-data-filter.c:212
+#: ../libgda-ui/gdaui-data-filter.c:210
msgid "any valid SQL expression"
msgstr "任何有效的 SQL 表达式"
-#: ../libgda-ui/gdaui-data-filter.c:216
+#: ../libgda-ui/gdaui-data-filter.c:214
msgid ""
"Columns can be referenced by their name or more easily using <b><tt>_<"
"column number></tt></b>. For example a valid expression can be: <b><tt>_2 "
@@ -3939,19 +4019,19 @@ msgstr ""
"效的表达式：<b><tt>_2 like 'doe%'</tt></b> 用来过滤第 2 列以 <tt>doe</tt> 开"
"头的行。"
-#: ../libgda-ui/gdaui-data-filter.c:233
+#: ../libgda-ui/gdaui-data-filter.c:231
msgid "Set filter"
msgstr "设置过滤器"
-#: ../libgda-ui/gdaui-data-filter.c:238
+#: ../libgda-ui/gdaui-data-filter.c:236
msgid "Clear filter"
msgstr "清理过滤器"
-#: ../libgda-ui/gdaui-data-proxy-info.c:836
+#: ../libgda-ui/gdaui-data-proxy-info.c:821
msgid "Undelete the selected entry"
msgstr "取消删除选中的记录"
-#: ../libgda-ui/gdaui-data-proxy-info.c:843
+#: ../libgda-ui/gdaui-data-proxy-info.c:828
msgid "Delete the selected entry"
msgstr "删除选中的记录"
@@ -3960,51 +4040,51 @@ msgstr "删除选中的记录"
msgid "Invalid column number %d"
msgstr "无效的列号 %d"
-#: ../libgda-ui/gdaui-data-store.c:137
+#: ../libgda-ui/gdaui-data-store.c:138
msgid "Data model"
msgstr "数据模型"
-#: ../libgda-ui/gdaui-data-store.c:141
+#: ../libgda-ui/gdaui-data-store.c:142
msgid "Internal GdaDataProxy data model"
msgstr "内部 GdaDataProxy 数据模型"
-#: ../libgda-ui/gdaui-data-store.c:386 ../libgda-ui/gdaui-data-store.c:453
-#: ../libgda-ui/gdaui-data-store.c:483 ../libgda-ui/gdaui-data-store.c:513
+#: ../libgda-ui/gdaui-data-store.c:387 ../libgda-ui/gdaui-data-store.c:454
+#: ../libgda-ui/gdaui-data-store.c:484 ../libgda-ui/gdaui-data-store.c:514
msgid "Can't modify row while data model is being reset"
msgstr "在数据模型正在重置时无法修改行"
-#: ../libgda-ui/gdaui-data-store.c:400
+#: ../libgda-ui/gdaui-data-store.c:401
msgid "Trying to modify a read-only row"
msgstr "试图修改只读的行"
-#: ../libgda-ui/gdaui-data-store.c:596
+#: ../libgda-ui/gdaui-data-store.c:597
msgid "Can't access row while data model is being reset"
msgstr "在数据模型正在重置时无法访问行"
-#: ../libgda-ui/gdaui-init.c:71
+#: ../libgda-ui/gdaui-init.c:72
msgid "Attempt to initialize an already initialized library"
msgstr "试图初始化一个已初始化的库"
-#: ../libgda-ui/gdaui-init.c:477
+#: ../libgda-ui/gdaui-init.c:512
msgid "Could not open plugins directory, no plugin loaded."
msgstr "无法打开插件目录，没有已经加载的插件。"
-#: ../libgda-ui/gdaui-init.c:497
+#: ../libgda-ui/gdaui-init.c:532
#: ../tools/browser/data-manager/data-widget.c:383
#: ../tools/browser/data-manager/data-widget.c:388
#: ../tools/browser/data-manager/data-widget.c:390
-#: ../tools/browser/data-manager/xml-spec-editor.c:232
-#: ../tools/browser/query-exec/query-result.c:284 ../tools/web-server.c:2018
+#: ../tools/browser/data-manager/xml-spec-editor.c:233
+#: ../tools/browser/query-exec/query-result.c:284 ../tools/web-server.c:2024
#, c-format
msgid "Error: %s"
msgstr "错误：%s"
-#: ../libgda-ui/gdaui-init.c:504
+#: ../libgda-ui/gdaui-init.c:540
#, c-format
msgid "Loading file %s...\n"
msgstr "正在加载文件 %s...\n"
-#: ../libgda-ui/gdaui-init.c:507
+#: ../libgda-ui/gdaui-init.c:544
#, c-format
msgid "Plugins load warning: %s"
msgstr "插件加载警告：%s"
@@ -4019,196 +4099,196 @@ msgid "Specify connection:"
msgstr "指定连接"
#. Create the DSN add button
-#: ../libgda-ui/gdaui-login.c:199
+#: ../libgda-ui/gdaui-login.c:198
msgid "Data sources..."
msgstr "数据源..."
-#: ../libgda-ui/gdaui-login.c:438
+#: ../libgda-ui/gdaui-login.c:447
msgid "Could not execute the Database access control center"
msgstr "无法执行数据库访问控制中心"
-#: ../libgda-ui/gdaui-raw-form.c:183 ../libgda-ui/gdaui-raw-grid.c:315
+#: ../libgda-ui/gdaui-raw-form.c:184 ../libgda-ui/gdaui-raw-grid.c:316
msgid "Data to display"
msgstr "要显示的数据"
-#: ../libgda-ui/gdaui-raw-form.c:199 ../libgda-ui/gdaui-raw-grid.c:195
+#: ../libgda-ui/gdaui-raw-form.c:200 ../libgda-ui/gdaui-raw-grid.c:196
msgid "Delete the current record"
msgstr "删除当前记录"
-#: ../libgda-ui/gdaui-raw-form.c:203 ../libgda-ui/gdaui-raw-grid.c:199
+#: ../libgda-ui/gdaui-raw-form.c:204 ../libgda-ui/gdaui-raw-grid.c:200
msgid "Create a new record"
msgstr "创建一个新记录"
-#: ../libgda-ui/gdaui-raw-form.c:204 ../libgda-ui/gdaui-raw-grid.c:200
+#: ../libgda-ui/gdaui-raw-form.c:205 ../libgda-ui/gdaui-raw-grid.c:201
msgid "Commit the modifications"
msgstr "提交修改"
-#: ../libgda-ui/gdaui-raw-form.c:205 ../libgda-ui/gdaui-raw-grid.c:201
+#: ../libgda-ui/gdaui-raw-form.c:206 ../libgda-ui/gdaui-raw-grid.c:202
msgid "Clear all the modifications"
msgstr "清空所有修改"
-#: ../libgda-ui/gdaui-raw-form.c:206
+#: ../libgda-ui/gdaui-raw-form.c:207
msgid "Go to first record"
msgstr "转到第一条记录"
-#: ../libgda-ui/gdaui-raw-form.c:207
+#: ../libgda-ui/gdaui-raw-form.c:208
msgid "Go to last record"
msgstr "转到最后一条记录"
-#: ../libgda-ui/gdaui-raw-form.c:208
+#: ../libgda-ui/gdaui-raw-form.c:209
msgid "Go to previous record"
msgstr "转到上一条记录"
-#: ../libgda-ui/gdaui-raw-form.c:209
+#: ../libgda-ui/gdaui-raw-form.c:210
msgid "Go to next record"
msgstr "转到下一条记录"
-#: ../libgda-ui/gdaui-raw-form.c:210 ../libgda-ui/gdaui-raw-grid.c:206
+#: ../libgda-ui/gdaui-raw-form.c:211 ../libgda-ui/gdaui-raw-grid.c:207
msgid "Filter records"
msgstr "过滤记录"
-#: ../libgda-ui/gdaui-raw-form.c:629
+#: ../libgda-ui/gdaui-raw-form.c:630
#, c-format
msgid "Can't append row to data model: %s"
msgstr "无法追加列到数据模型：%s"
-#: ../libgda-ui/gdaui-raw-grid.c:202
+#: ../libgda-ui/gdaui-raw-grid.c:203
msgid "Go to first chunck"
msgstr "转到第一个块"
-#: ../libgda-ui/gdaui-raw-grid.c:203
+#: ../libgda-ui/gdaui-raw-grid.c:204
msgid "Go to last chunck"
msgstr "转到最后一个块"
-#: ../libgda-ui/gdaui-raw-grid.c:204
+#: ../libgda-ui/gdaui-raw-grid.c:205
msgid "Go to previous chunck"
msgstr "转到上一个块"
-#: ../libgda-ui/gdaui-raw-grid.c:205
+#: ../libgda-ui/gdaui-raw-grid.c:206
msgid "Go to next chunck"
msgstr "转到下一下块"
-#: ../libgda-ui/gdaui-raw-grid.c:320
+#: ../libgda-ui/gdaui-raw-grid.c:321
msgid ""
"Pointer to an XML layout specification (as an xmlNodePtr to a <gdaui_grid> "
"node)"
msgstr "指向 XML 布局规范 (作为指向 <gdaui_grid> 节点的一个 xmlNodePtr)"
-#: ../libgda-ui/gdaui-raw-grid.c:323
+#: ../libgda-ui/gdaui-raw-grid.c:324
msgid "Info cell visible"
msgstr "信息单元格可见"
-#: ../libgda-ui/gdaui-raw-grid.c:327
+#: ../libgda-ui/gdaui-raw-grid.c:328
msgid "Global Actions visible"
msgstr "全局操作可见"
#. FIXME: if nullok is FALSE, then set the column title in bold
-#: ../libgda-ui/gdaui-raw-grid.c:786 ../libgda-ui/gdaui-raw-grid.c:809
+#: ../libgda-ui/gdaui-raw-grid.c:788 ../libgda-ui/gdaui-raw-grid.c:811
msgid "Can't be NULL"
msgstr "不能是 NULL"
-#: ../libgda-ui/gdaui-raw-grid.c:817
+#: ../libgda-ui/gdaui-raw-grid.c:819
msgid "No title"
msgstr "无标题"
-#: ../libgda-ui/gdaui-raw-grid.c:1902
+#: ../libgda-ui/gdaui-raw-grid.c:1916
msgid "Shown columns"
msgstr "已显示的列"
-#: ../libgda-ui/gdaui-raw-grid.c:1934
+#: ../libgda-ui/gdaui-raw-grid.c:1948
msgid "Select _All"
msgstr "全部选择(_A)"
-#: ../libgda-ui/gdaui-raw-grid.c:1939
+#: ../libgda-ui/gdaui-raw-grid.c:1953
msgid "_Clear Selection"
msgstr "清理选择(_C)"
-#: ../libgda-ui/gdaui-raw-grid.c:1942
+#: ../libgda-ui/gdaui-raw-grid.c:1956
msgid "Show Column _Titles"
msgstr "显示列标题(_T)"
-#: ../libgda-ui/gdaui-raw-grid.c:1947
+#: ../libgda-ui/gdaui-raw-grid.c:1961
msgid "_Set filter"
msgstr "设置过滤器(_S)"
-#: ../libgda-ui/gdaui-raw-grid.c:1950
+#: ../libgda-ui/gdaui-raw-grid.c:1964
msgid "_Unset filter"
msgstr "重设过滤器(_U)"
#. create dialog box
-#: ../libgda-ui/gdaui-raw-grid.c:2136
+#: ../libgda-ui/gdaui-raw-grid.c:2152
msgid "Saving Data"
msgstr "保存数据"
-#: ../libgda-ui/gdaui-raw-grid.c:2144
+#: ../libgda-ui/gdaui-raw-grid.c:2160
msgid "Saving data to a file"
msgstr "保存数据到文件"
-#: ../libgda-ui/gdaui-raw-grid.c:2145
+#: ../libgda-ui/gdaui-raw-grid.c:2161
msgid "The data will be exported to the selected file."
msgstr "数据将导出到所选文件中。"
-#: ../libgda-ui/gdaui-raw-grid.c:2155 ../tools/config-info.c:426
+#: ../libgda-ui/gdaui-raw-grid.c:2171 ../tools/config-info.c:426
msgid "File name"
msgstr "文件名"
#. To translators: "Details" is a table's column's attribute
-#: ../libgda-ui/gdaui-raw-grid.c:2176
-#: ../tools/browser/schema-browser/table-columns.c:665
+#: ../libgda-ui/gdaui-raw-grid.c:2192
+#: ../tools/browser/schema-browser/table-columns.c:666
msgid "Details"
msgstr "细节"
#. file type
-#: ../libgda-ui/gdaui-raw-grid.c:2197
+#: ../libgda-ui/gdaui-raw-grid.c:2213
msgid "File type:"
msgstr "文件类型："
-#: ../libgda-ui/gdaui-raw-grid.c:2207
+#: ../libgda-ui/gdaui-raw-grid.c:2223
msgid "Tab-delimited"
msgstr "制表符分隔"
-#: ../libgda-ui/gdaui-raw-grid.c:2208
+#: ../libgda-ui/gdaui-raw-grid.c:2224
msgid "Comma-delimited"
msgstr "逗号分隔"
-#: ../libgda-ui/gdaui-raw-grid.c:2209
+#: ../libgda-ui/gdaui-raw-grid.c:2225
msgid "XML"
msgstr "XML"
#. data scope
-#: ../libgda-ui/gdaui-raw-grid.c:2216
+#: ../libgda-ui/gdaui-raw-grid.c:2232
msgid "Data to save:"
msgstr "要保存的数据："
-#: ../libgda-ui/gdaui-raw-grid.c:2231
+#: ../libgda-ui/gdaui-raw-grid.c:2247
msgid "All data (without any local modification)"
msgstr "所有数据(没有任何本地修改)"
-#: ../libgda-ui/gdaui-raw-grid.c:2232
+#: ../libgda-ui/gdaui-raw-grid.c:2248
msgid "Only displayed data"
msgstr "仅显示的数据"
-#: ../libgda-ui/gdaui-raw-grid.c:2234
+#: ../libgda-ui/gdaui-raw-grid.c:2250
msgid "Only selected data"
msgstr "仅选择的数据"
-#: ../libgda-ui/gdaui-raw-grid.c:2239
+#: ../libgda-ui/gdaui-raw-grid.c:2255
msgid "Other options"
msgstr "其他选项"
-#: ../libgda-ui/gdaui-raw-grid.c:2246
+#: ../libgda-ui/gdaui-raw-grid.c:2262
msgid "Empty string when NULL?"
msgstr "在 NULL 时使用空字符串？"
-#: ../libgda-ui/gdaui-raw-grid.c:2249 ../libgda-ui/gdaui-raw-grid.c:2254
+#: ../libgda-ui/gdaui-raw-grid.c:2265 ../libgda-ui/gdaui-raw-grid.c:2270
msgid "Export NULL values as an empty \"\" string"
msgstr "将 NULL 值导出为空 \"\" 字符串"
-#: ../libgda-ui/gdaui-raw-grid.c:2256
+#: ../libgda-ui/gdaui-raw-grid.c:2272
msgid "Invalid data as NULL?"
msgstr "无效的数据当作 NULL？"
-#: ../libgda-ui/gdaui-raw-grid.c:2259 ../libgda-ui/gdaui-raw-grid.c:2264
+#: ../libgda-ui/gdaui-raw-grid.c:2275 ../libgda-ui/gdaui-raw-grid.c:2280
msgid ""
"Don't export invalid data,\n"
"but export a NULL value instead"
@@ -4216,28 +4296,28 @@ msgstr ""
"不导出无效数据，\n"
"而是导出一个 NULL 值"
-#: ../libgda-ui/gdaui-raw-grid.c:2266
+#: ../libgda-ui/gdaui-raw-grid.c:2282
msgid "Field names on first row?"
msgstr "第一行为字段名？"
-#: ../libgda-ui/gdaui-raw-grid.c:2269 ../libgda-ui/gdaui-raw-grid.c:2274
+#: ../libgda-ui/gdaui-raw-grid.c:2285 ../libgda-ui/gdaui-raw-grid.c:2290
msgid "Add a row at beginning with columns names"
msgstr "在开头添加一个包含列名的行"
-#: ../libgda-ui/gdaui-raw-grid.c:2450
+#: ../libgda-ui/gdaui-raw-grid.c:2467
#, c-format
msgid "Could not save file %s"
msgstr "无法保存文件 %s"
-#: ../libgda-ui/gdaui-raw-grid.c:2458
+#: ../libgda-ui/gdaui-raw-grid.c:2475
msgid "You must specify a file name"
msgstr "您必须指定一个文件名"
-#: ../libgda-ui/gdaui-raw-grid.c:2464
+#: ../libgda-ui/gdaui-raw-grid.c:2481
msgid "Got empty file while converting the data"
msgstr "转换数据时获得了空文件"
-#: ../libgda-ui/gdaui-raw-grid.c:2477
+#: ../libgda-ui/gdaui-raw-grid.c:2494
#, c-format
msgid ""
"File '%s' already exists.\n"
@@ -4246,11 +4326,11 @@ msgstr ""
"文件 '%s' 已经存在。\n"
"确认要覆盖它吗？"
-#: ../libgda-ui/gdaui-raw-grid.c:2487
+#: ../libgda-ui/gdaui-raw-grid.c:2504
msgid "If you choose yes, the contents will be lost."
msgstr "如果您选择是，内容将丢失。"
-#: ../libgda-ui/gdaui-rt-editor.c:93
+#: ../libgda-ui/gdaui-rt-editor.c:92
msgid ""
"\"\"\"= Title level 1 =\n"
"== Title level 2 ==\n"
@@ -4300,125 +4380,125 @@ msgstr ""
"\n"
"原文区用三个半角双引号括起来，标记将不被解释"
-#: ../libgda-ui/gdaui-rt-editor.c:160
+#: ../libgda-ui/gdaui-rt-editor.c:159
msgid "_Bold"
msgstr "粗体(_B)"
-#: ../libgda-ui/gdaui-rt-editor.c:160
+#: ../libgda-ui/gdaui-rt-editor.c:159
msgid "Bold text"
msgstr "粗体文本"
-#: ../libgda-ui/gdaui-rt-editor.c:161
+#: ../libgda-ui/gdaui-rt-editor.c:160
msgid "_Italic"
msgstr "斜体(_I)"
-#: ../libgda-ui/gdaui-rt-editor.c:161
+#: ../libgda-ui/gdaui-rt-editor.c:160
msgid "Italic text"
msgstr "斜体文本"
-#: ../libgda-ui/gdaui-rt-editor.c:162
+#: ../libgda-ui/gdaui-rt-editor.c:161
msgid "_Underline"
msgstr "下划线(_U)"
-#: ../libgda-ui/gdaui-rt-editor.c:162
+#: ../libgda-ui/gdaui-rt-editor.c:161
msgid "Underline text"
msgstr "下划线文本"
-#: ../libgda-ui/gdaui-rt-editor.c:163
+#: ../libgda-ui/gdaui-rt-editor.c:162
msgid "_Strike through"
msgstr "删除线(_S)"
-#: ../libgda-ui/gdaui-rt-editor.c:163
+#: ../libgda-ui/gdaui-rt-editor.c:162
msgid "Strike through text"
msgstr "删除线文本"
-#: ../libgda-ui/gdaui-rt-editor.c:164
+#: ../libgda-ui/gdaui-rt-editor.c:163
msgid "_Syntax help"
msgstr "语法帮助(_S)"
-#: ../libgda-ui/gdaui-rt-editor.c:164
+#: ../libgda-ui/gdaui-rt-editor.c:163
msgid "Show syntax help"
msgstr "显示语法帮助"
-#: ../libgda-ui/gdaui-rt-editor.c:168
+#: ../libgda-ui/gdaui-rt-editor.c:167
msgid "_Add image"
msgstr "添加图像(_A)"
-#: ../libgda-ui/gdaui-rt-editor.c:168
+#: ../libgda-ui/gdaui-rt-editor.c:167
msgid "Insert image"
msgstr "插入图像"
-#: ../libgda-ui/gdaui-rt-editor.c:169
+#: ../libgda-ui/gdaui-rt-editor.c:168
msgid "_Normal text"
msgstr "正常文本(_N)"
-#: ../libgda-ui/gdaui-rt-editor.c:169
+#: ../libgda-ui/gdaui-rt-editor.c:168
msgid "Reset to normal text"
msgstr "重置为正常文本"
-#: ../libgda-ui/gdaui-rt-editor.c:244
+#: ../libgda-ui/gdaui-rt-editor.c:243
msgid "Don't display a specific background for the text"
msgstr "不显示文本的特定背景"
-#: ../libgda-ui/gdaui-rt-editor.c:254
+#: ../libgda-ui/gdaui-rt-editor.c:253
msgid "Display raw markup text instead of formatted text"
msgstr "显示原始的标记文本而非格式化文本"
-#: ../libgda-ui/gdaui-rt-editor.c:265
+#: ../libgda-ui/gdaui-rt-editor.c:264
msgid "The buffer which is displayed"
msgstr "所显示的缓存"
-#: ../libgda-ui/gdaui-rt-editor.c:276
+#: ../libgda-ui/gdaui-rt-editor.c:275
msgid "Determines if the contents appears in a scrolled window"
msgstr "确定内容是否在滚动窗口中显示"
-#: ../libgda-ui/gdaui-rt-editor.c:908
+#: ../libgda-ui/gdaui-rt-editor.c:896
msgid "Reset font size"
msgstr "重置字号"
-#: ../libgda-ui/gdaui-rt-editor.c:914
+#: ../libgda-ui/gdaui-rt-editor.c:902
msgid "Decrease font size (zoom out)"
msgstr "减小字号(缩小)"
-#: ../libgda-ui/gdaui-rt-editor.c:920
+#: ../libgda-ui/gdaui-rt-editor.c:908
msgid "Increase font size (zoom in)"
msgstr "增加字号(放大)"
-#: ../libgda-ui/gdaui-rt-editor.c:926
+#: ../libgda-ui/gdaui-rt-editor.c:914
msgid "Show source markup"
msgstr "显示源标记"
-#: ../libgda-ui/gdaui-server-operation.c:198
+#: ../libgda-ui/gdaui-server-operation.c:199
msgid "The specification of the operation to implement"
msgstr "要实现的操作规范"
-#: ../libgda-ui/gdaui-server-operation.c:204
+#: ../libgda-ui/gdaui-server-operation.c:205
msgid "Request section header to be hidden if there is only one section"
msgstr "若只有一节，要求节标题隐藏"
#. last row is for new entries
-#: ../libgda-ui/gdaui-server-operation.c:598
-#: ../tools/browser/data-manager/data-console.c:396
+#: ../libgda-ui/gdaui-server-operation.c:596
+#: ../tools/browser/data-manager/data-console.c:393
msgid "Add"
msgstr "添加"
-#: ../libgda-ui/gdaui-server-operation.c:1115
+#: ../libgda-ui/gdaui-server-operation.c:1093
msgid "Server operation specification"
msgstr "服务器操作规范"
-#: ../libgda-ui/gdaui-server-operation.c:1172
+#: ../libgda-ui/gdaui-server-operation.c:1150
msgid "<b>Field properties:</b>"
msgstr "<b>字段属性：</b>"
-#: ../libgda-ui/gdaui-server-operation.c:1191
+#: ../libgda-ui/gdaui-server-operation.c:1169
msgid "<b>Fields:</b>"
msgstr "<b>字段:</b>"
-#: ../libgda-ui/gdaui-server-operation.c:1240
+#: ../libgda-ui/gdaui-server-operation.c:1218
msgid "Add a new field"
msgstr "添加一个新字段"
-#: ../libgda-ui/gdaui-server-operation.c:1242
+#: ../libgda-ui/gdaui-server-operation.c:1220
msgid "Remove selected field"
msgstr "移除选中的字段"
@@ -4426,12 +4506,12 @@ msgstr "移除选中的字段"
msgid "GdaTree to use"
msgstr "要使用的 GdaTree"
-#: ../libgda-ui/gdaui-tree-store.c:719
+#: ../libgda-ui/gdaui-tree-store.c:739
#, c-format
msgid "Unknown column number %d"
msgstr "未知的列名 %d"
-#: ../libgda-ui/gdaui-tree-store.c:739
+#: ../libgda-ui/gdaui-tree-store.c:759
#, c-format
msgid "Type mismatch: expected a value of type %s and got of type %s"
msgstr "类型不匹配：应为 %s 类型，而得到了 %s 类型"
@@ -4513,24 +4593,24 @@ msgstr "要使用的 Berkeley DB 数据库文件名"
#: ../providers/bdb/bdb_specs_dsn.xml.in.h:3
#: ../providers/bdbsql/bdbsql_specs_create_db.xml.in.h:8
#: ../providers/bdbsql/bdbsql_specs_drop_db.xml.in.h:8
-#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:3
+#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:5
#: ../providers/firebird/firebird_specs_dsn_emb.xml.in.h:3
#: ../providers/mdb/mdb_specs_dsn.xml.in.h:3
#: ../providers/sqlcipher/sqlcipher_specs_create_db.xml.in.h:8
#: ../providers/sqlcipher/sqlcipher_specs_drop_db.xml.in.h:8
-#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:3
+#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:5
#: ../providers/sqlite/sqlite_specs_create_db.xml.in.h:8
#: ../providers/sqlite/sqlite_specs_drop_db.xml.in.h:8
-#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:3
+#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:5
msgid "Directory"
msgstr "目录"
#: ../providers/bdb/bdb_specs_dsn.xml.in.h:4
-#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:4
+#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:6
#: ../providers/firebird/firebird_specs_dsn_emb.xml.in.h:4
#: ../providers/mdb/mdb_specs_dsn.xml.in.h:4
-#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:4
-#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:4
+#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:6
+#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:6
msgid "Directory where the database file is stored"
msgstr "存储数据库文件的目录"
@@ -4540,9 +4620,10 @@ msgstr "存储数据库文件的目录"
#: ../providers/bdbsql/bdbsql_specs_drop_db.xml.in.h:4
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:1
#: ../providers/firebird/firebird_specs_dsn_emb.xml.in.h:1
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:1
#: ../providers/mdb/mdb_specs_dsn.xml.in.h:1
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:18
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:18
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:20
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:20
#: ../providers/mysql/mysql_specs_dsn.xml.in.h:1
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:17
#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:17
@@ -4570,7 +4651,7 @@ msgid "An error occurred while accessing the BDB database"
msgstr "访问 BDB 数据库时出错"
#: ../providers/bdb/gda-bdb-provider.c:201
-#: ../providers/ldap/gda-ldap-provider.c:606
+#: ../providers/ldap/gda-ldap-provider.c:604
#: ../providers/mdb/gda-mdb-provider.c:321
msgid "Can't open virtual connection"
msgstr "无法打开数据连接"
@@ -4619,7 +4700,7 @@ msgstr "列描述"
#: ../providers/sqlite/sqlite_specs_drop_table.xml.in.h:1
#: ../providers/sqlite/sqlite_specs_rename_table.xml.in.h:1
#: ../tools/browser/data-manager/data-source-editor.c:170
-#: ../tools/browser/schema-browser/table-info.c:988
+#: ../tools/browser/schema-browser/table-info.c:989
msgid "Table"
msgstr "表"
@@ -4718,7 +4799,7 @@ msgstr "非 NULL"
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:26
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:9
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:26
-#: ../tools/command-exec.c:1173 ../tools/web-server.c:929
+#: ../tools/command-exec.c:665 ../tools/web-server.c:935
msgid "Default"
msgstr "默认"
@@ -4763,8 +4844,8 @@ msgstr "检查约束"
#. DSN parameters
#: ../providers/bdbsql/bdbsql_specs_create_db.xml.in.h:2
#: ../providers/bdbsql/bdbsql_specs_drop_db.xml.in.h:2
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:16
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:16
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:18
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:18
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:15
#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:15
#: ../providers/sqlcipher/sqlcipher_specs_create_db.xml.in.h:2
@@ -4777,8 +4858,8 @@ msgstr "数据库描述"
#. DSN parameters
#: ../providers/bdbsql/bdbsql_specs_create_db.xml.in.h:6
#: ../providers/bdbsql/bdbsql_specs_drop_db.xml.in.h:6
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:20
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:20
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:22
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:22
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:19
#: ../providers/sqlcipher/sqlcipher_specs_create_db.xml.in.h:6
#: ../providers/sqlcipher/sqlcipher_specs_drop_db.xml.in.h:6
@@ -4810,9 +4891,9 @@ msgstr "索引描述"
#: ../providers/mysql/mysql_specs_create_index.xml.in.h:2
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:2
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:2
-#: ../tools/browser/schema-browser/table-columns.c:644
-#: ../tools/command-exec.c:1095 ../tools/command-exec.c:1171
-#: ../tools/web-server.c:927
+#: ../tools/browser/schema-browser/table-columns.c:645
+#: ../tools/command-exec.c:587 ../tools/command-exec.c:663
+#: ../tools/web-server.c:933
msgid "Type"
msgstr "类型"
@@ -4844,8 +4925,8 @@ msgstr "类型"
#: ../tools/browser/data-manager/data-favorite-selector.c:304
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:299
#: ../tools/browser/query-exec/query-favorite-selector.c:352
-#: ../tools/command-exec.c:1094 ../tools/gda-sql.c:3571
-#: ../tools/gda-sql.c:3866 ../tools/gda-sql.c:4667 ../tools/gda-sql.c:4707
+#: ../tools/command-exec.c:586 ../tools/gda-sql.c:2979 ../tools/gda-sql.c:3277
+#: ../tools/gda-sql.c:3994 ../tools/gda-sql.c:4034
msgid "Name"
msgstr "名称"
@@ -4870,7 +4951,7 @@ msgstr "表中"
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:6
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:5
#: ../providers/bdbsql/bdbsql_specs_create_view.xml.in.h:5
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:22
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:24
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:5
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:6
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:5
@@ -4979,8 +5060,8 @@ msgstr "表列"
#: ../providers/postgres/postgres_specs_create_table.xml.in.h:27
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:20
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:20
-#: ../tools/command-exec.c:1027 ../tools/command-exec.c:1030
-#: ../tools/web-server.c:899 ../tools/web-server.c:902
+#: ../tools/command-exec.c:516 ../tools/command-exec.c:519
+#: ../tools/web-server.c:905 ../tools/web-server.c:908
msgid "Auto increment"
msgstr "自动增量"
@@ -4995,7 +5076,7 @@ msgstr "自动增量"
#: ../providers/postgres/postgres_specs_create_table.xml.in.h:29
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:22
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:22
-#: ../tools/command-exec.c:1327
+#: ../tools/command-exec.c:821
msgid "Unique"
msgstr "唯一"
@@ -5010,8 +5091,8 @@ msgstr "唯一"
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:24
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:24
#: ../tools/browser/schema-browser/mgr-columns.c:379
-#: ../tools/browser/schema-browser/table-columns.c:230
-#: ../tools/command-exec.c:1281
+#: ../tools/browser/schema-browser/table-columns.c:231
+#: ../tools/command-exec.c:774
msgid "Primary key"
msgstr "主键"
@@ -5026,7 +5107,7 @@ msgstr "主键"
#: ../providers/postgres/postgres_specs_create_table.xml.in.h:35
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:28
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:28
-#: ../tools/browser/schema-browser/table-columns.c:658
+#: ../tools/browser/schema-browser/table-columns.c:659
msgid "Default value"
msgstr "默认值"
@@ -5107,8 +5188,8 @@ msgstr "视图定义"
#: ../providers/postgres/postgres_specs_drop_index.xml.in.h:1
#: ../providers/sqlcipher/sqlcipher_specs_drop_index.xml.in.h:1
#: ../providers/sqlite/sqlite_specs_drop_index.xml.in.h:1
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:171
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:177
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:172
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:178
msgid "Index"
msgstr "索引"
@@ -5191,64 +5272,77 @@ msgstr "只有视图存在时才丢弃"
msgid "The name of a database to use (without the .db)"
msgstr "要使用的数据库的名字 (不带 .db)"
-#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:5
-#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:5
-#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:5
-msgid "Extra functions"
-msgstr "额外函数"
+#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:3
+#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:3
+#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:3
+msgid "Append '.db'"
+msgstr "附加“.db”"
-#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:6
-#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:6
-#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:6
-msgid "Enable usage of extra functions (gda_upper, ...)"
-msgstr "允许使用额外的函数(gda_upper等)"
+#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:4
+#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:4
+#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:4
+msgid ""
+"Defines if the '.db' extension need to be appended to the DB_NAME argument"
+msgstr "定义是否需要向 DB_NAME 参数附加“.db”扩展名"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:7
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:7
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:7
-msgid "Define REGEXP"
-msgstr "定义 REGEXP"
+msgid "Extra functions"
+msgstr "额外函数"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:8
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:8
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:8
-msgid "Define the REGEXP function"
-msgstr "定义 REGEXP 函数"
+msgid "Enable usage of extra functions (gda_upper, ...)"
+msgstr "允许使用额外的函数(gda_upper等)"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:9
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:9
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:9
-msgid "Localized comparisons"
-msgstr "本地化的比较"
+msgid "Define REGEXP"
+msgstr "定义 REGEXP"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:10
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:10
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:10
-msgid "Enable usage of extra collation methods (LOCALE and DCASE)"
-msgstr "允许使用额外的排序方法(LOCALE 和 DCASE)"
+msgid "Define the REGEXP function"
+msgstr "定义 REGEXP 函数"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:11
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:11
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:11
-#, fuzzy
-msgid "With foreign keys"
-msgstr "使用外键"
+msgid "Localized comparisons"
+msgstr "本地化的比较"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:12
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:12
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:12
-msgid "Enforce foreign keys"
-msgstr "强制外键"
+msgid "Enable usage of extra collation methods (LOCALE and DCASE)"
+msgstr "允许使用额外的排序方法(LOCALE 和 DCASE)"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:13
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:13
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:13
-msgid "Allow extensions"
-msgstr "允许扩展"
+#, fuzzy
+msgid "With foreign keys"
+msgstr "使用外键"
#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:14
#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:14
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:14
+msgid "Enforce foreign keys"
+msgstr "强制外键"
+
+#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:15
+#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:15
+#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:15
+msgid "Allow extensions"
+msgstr "允许扩展"
+
+#: ../providers/bdbsql/bdbsql_specs_dsn.xml.in.h:16
+#: ../providers/sqlcipher/sqlcipher_specs_dsn.xml.in.h:16
+#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:16
msgid "Allow SQLite to load extensions using the load_extension() function"
msgstr "允许 SQLite 使用 load_extension() 函数加载扩展"
@@ -5288,11 +5382,11 @@ msgstr "BDB SQL 数据库的提供者"
msgid "The name of a database to connect to (without the .fdb)"
msgstr "要连接的数据库的名字(不带 .db)"
-#: ../providers/firebird/libmain-client.c:51
+#: ../providers/firebird/libmain-client.c:69
msgid "Provider for Firebird databases"
msgstr "Firebird 数据库的提供者"
-#: ../providers/firebird/libmain-embed.c:51
+#: ../providers/firebird/libmain-embed.c:69
msgid "Provider for embedded Firebird databases"
msgstr "嵌入式 Firebird 数据库的提供者"
@@ -5309,9 +5403,11 @@ msgstr "无效的参数：NULL"
msgid "Can't read BLOB"
msgstr "无法读取 BLOB"
-#: ../providers/jdbc/gda-jdbc-provider.c:365
-msgid "The connection string must contain the URL value"
-msgstr "连接字符串必须包含 URL 值"
+#: ../providers/jdbc/gda-jdbc-provider.c:494
+#, fuzzy
+#| msgid "Missing parameter(s) to execute query"
+msgid "Missing parameters to open database connection"
+msgstr "丢失要执行查询的参数"
#: ../providers/jdbc/GdaJValue.c:187
#, c-format
@@ -5322,21 +5418,81 @@ msgstr "无效日期：年 %d，月 %d，日 %d"
msgid "Can't get BLOB's size"
msgstr "无法获取 BLOB 大小"
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:2
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:2
+#: ../providers/postgres/postgres_specs_dsn.xml.in.h:2
+msgid "The name of a database to connect to"
+msgstr "要连接到的数据库的名称"
+
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:3
+#, fuzzy
+#| msgid "Inheritance"
+msgid "Instance"
+msgstr "继承"
+
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:4
+msgid ""
+"The instance to connect to, if not specified, a connection to the default "
+"instance is made"
+msgstr "要连接的实例；如果不指定，会创建与默认实例的连接"
+
+#. Connection parameters
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:5
+#: ../providers/ldap/ldap_specs_dsn.xml.in.h:3
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:3
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:3
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:3
+#: ../providers/postgres/postgres_specs_create_db.xml.in.h:3
+#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:3
+#: ../providers/postgres/postgres_specs_dsn.xml.in.h:5
+msgid "Database server"
+msgstr "数据库服务器"
+
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:6
+#, fuzzy
+#| msgid "Host on which the database server is running"
+msgid "Host on which the database server is running or leave this field empty"
+msgstr "正自 运行数据库服务器的主机"
+
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:7
+#: ../providers/ldap/ldap_specs_dsn.xml.in.h:5
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:6
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:6
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:5
+#: ../providers/postgres/postgres_specs_create_db.xml.in.h:6
+#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:6
+#: ../providers/postgres/postgres_specs_dsn.xml.in.h:7
+#: ../providers/web/web_specs_dsn.xml.in.h:3
+msgid "Port"
+msgstr "端口"
+
+#: ../providers/jdbc/jdbc_specs_com.microsoft.sqlserver.jdbc.SQLServerDriver_dsn.xml.in.h:8
+#, fuzzy
+#| msgid "Database server port"
+msgid "Database server port, 1433 by default"
+msgstr "数据库服务器端口"
+
#: ../providers/jdbc/jdbc_specs_dsn.xml.in.h:1
msgid "Connection URL"
msgstr "连接 URL"
+#: ../providers/jdbc/jdbc_specs_dsn.xml.in.h:2
+msgid ""
+"Connection string required by the JDBC driver, refer to the used JDBC driver "
+"for its contents and format"
+msgstr ""
+
#: ../providers/jdbc/libmain.c:153 ../providers/jdbc/libmain.c:163
#, c-format
msgid "Can't get list of installed JDBC drivers: %s"
msgstr "无法获得已安装的 JDBC 驱动程序的列表：%s"
-#: ../providers/jdbc/libmain.c:475
+#: ../providers/jdbc/libmain.c:479
#, c-format
msgid "Can't create JAVA virtual machine: %s"
msgstr "无法创建 JAVA 虚拟机：%s"
-#: ../providers/jdbc/libmain.c:483
+#: ../providers/jdbc/libmain.c:487
#, fuzzy
#| msgid "Could not the JVM runtime (libjvm.so), JDBC provider is unavailable."
msgid ""
@@ -5351,82 +5507,86 @@ msgstr "连接字符串必须包含 DB_NAME 值"
msgid "Invalid value for 'TLS_REQCERT'"
msgstr "“TLS_REQCERT”的值无效"
-#: ../providers/ldap/gda-ldap-provider.c:490
-msgid "Invalid user name"
-msgstr "无效的用户名"
+#: ../providers/ldap/gda-ldap-provider.c:866 ../tools/gda-sql.c:2827
+#: ../tools/gda-sql.c:4821 ../tools/gda-sql.c:5548 ../tools/gda-sql.c:5851
+#, c-format
+msgid "Too many arguments"
+msgstr "参数过多"
-#: ../providers/ldap/gda-ldap-provider.c:996
+#: ../providers/ldap/gda-ldap-provider.c:1016
msgid "Parameter"
msgstr "参数"
-#: ../providers/ldap/gda-ldap-provider.c:1210
+#: ../providers/ldap/gda-ldap-provider.c:1230
#, c-format
msgid "near \"%s\": syntax error"
msgstr "在“%s”附近：语法错误"
-#: ../providers/ldap/gda-ldap-util.c:1243
+#: ../providers/ldap/gda-ldap-util.c:1255
#, c-format
msgid "LDAP server returned more than one entry with DN '%s'"
msgstr "LDAP 服务器返回了多于一条 DN 为“%s”的记录"
-#: ../providers/ldap/gda-ldap-util.c:1385
+#: ../providers/ldap/gda-ldap-util.c:1397
msgid "Could not parse distinguished name returned by LDAP server"
msgstr "无法解析 LDAP 服务器返回的可区别名称"
-#: ../providers/ldap/gda-ldap-util.c:1627
+#: ../providers/ldap/gda-ldap-util.c:1639
#, c-format
msgid "Unexpected data type '%s' for objectClass attribute!"
msgstr "objectClass 属性的数据类型“%s”异常！"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:217
-#: ../providers/ldap/gdaprov-data-model-ldap.c:418
-#: ../providers/ldap/gdaprov-data-model-ldap.c:433
+#: ../providers/ldap/gdaprov-data-model-ldap.c:218
+#: ../providers/ldap/gdaprov-data-model-ldap.c:419
+#: ../providers/ldap/gdaprov-data-model-ldap.c:434
msgid "Distinguished name"
msgstr "可区别的名称"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:415
-#: ../providers/ldap/gdaprov-data-model-ldap.c:430
+#: ../providers/ldap/gdaprov-data-model-ldap.c:416
+#: ../providers/ldap/gdaprov-data-model-ldap.c:431
msgid "Relative distinguished name"
msgstr "相对可区别的名称"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:901
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1198
+#: ../providers/ldap/gdaprov-data-model-ldap.c:902
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1199
msgid "Truncated result because LDAP server limit encountered"
msgstr "结果被截断，因为达到了 LDAP 服务器限制"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1582
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1583
#, c-format
msgid "Unknown GdaLdapModificationType %d"
msgstr "未知的 GdaLdapModificationType %d"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1589
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1590
msgid "No GdaLdapEntry specified"
msgstr "未指定 GdaLdapEntry"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1595
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1596
msgid "No GdaLdapEntry specified to define attributes to add"
msgstr "没有为定义待添加的属性指定 GdaLdapEntry"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1601
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1602
msgid "No GdaLdapEntry specified to define attributes to remove"
msgstr "没有为定义待移除的属性指定 GdaLdapEntry"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1607
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1608
msgid "No GdaLdapEntry specified to define attributes to replace"
msgstr "没有为定义待替换的属性指定 GdaLdapEntry"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1613
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1614
msgid "No GdaLdapEntry specified to compare attributes"
msgstr "没有为比较属性指定 GdaLdapEntry"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1618
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1619
#, fuzzy
msgid "GdaLdapEntry specified to compare have different DN"
msgstr "指定的待比较的 GdaLdapEntry 具有不同的 DN"
#: ../providers/ldap/ldap_specs_auth.xml.in.h:2
-msgid "User name"
-msgstr "用户名"
+msgid ""
+"User name, as a DN or simple user name, for Active Directory may be "
+"username DOMAIN or DOMAIN\\username"
+msgstr ""
#: ../providers/ldap/ldap_specs_dsn.xml.in.h:1
msgid "Base name"
@@ -5436,32 +5596,10 @@ msgstr "基名"
msgid "Base distinguished name, starting point for the searches"
msgstr "基础的可区别名称，搜索的起点"
-#. Connection parameters
-#: ../providers/ldap/ldap_specs_dsn.xml.in.h:3
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:3
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:3
-#: ../providers/mysql/mysql_specs_dsn.xml.in.h:3
-#: ../providers/postgres/postgres_specs_create_db.xml.in.h:3
-#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:3
-#: ../providers/postgres/postgres_specs_dsn.xml.in.h:5
-msgid "Database server"
-msgstr "数据库服务器"
-
#: ../providers/ldap/ldap_specs_dsn.xml.in.h:4
msgid "Host on which the LDAP server is running"
msgstr "正在运行 LDAP 服务器的主机"
-#: ../providers/ldap/ldap_specs_dsn.xml.in.h:5
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:6
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:6
-#: ../providers/mysql/mysql_specs_dsn.xml.in.h:5
-#: ../providers/postgres/postgres_specs_create_db.xml.in.h:6
-#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:6
-#: ../providers/postgres/postgres_specs_dsn.xml.in.h:7
-#: ../providers/web/web_specs_dsn.xml.in.h:3
-msgid "Port"
-msgstr "端口"
-
#: ../providers/ldap/ldap_specs_dsn.xml.in.h:6
msgid "Database server port (leave this field empty to use the default port)"
msgstr "数据库服务器端口(不填这个字段来使用默认端口)"
@@ -5514,8 +5652,7 @@ msgstr "缓存服务器数据"
msgid ""
"Use a cache to store some static server data (the cached files are in the "
"user's cache directory), default is TRUE"
-msgstr ""
-"使用存储来存储一些静态服务器数据(缓存的文件在用户的缓存目录中)，默认为 TRUE"
+msgstr "使用存储来存储一些静态服务器数据(缓存的文件在用户的缓存目录中)，默认为 TRUE"
#: ../providers/ldap/ldap_specs_dsn.xml.in.h:15
msgid "Time limit"
@@ -5525,8 +5662,7 @@ msgstr "时间限制"
msgid ""
"Time limit after which a search operation should be terminated by the server "
"(leave undefined or 0 for unlimited)"
-msgstr ""
-"搜索操作的时间限制，超时后，搜索操作应被服务器终止(不填或设为 0 则无限制)"
+msgstr "搜索操作的时间限制，超时后，搜索操作应被服务器终止(不填或设为 0 则无限制)"
#: ../providers/ldap/ldap_specs_dsn.xml.in.h:17
msgid "Size limit"
@@ -5612,46 +5748,70 @@ msgstr "在外键约束中指定了空引用字段"
msgid "Incorrect specified column name"
msgstr "指定列的名称错误"
-#: ../providers/mysql/gda-mysql-handler-boolean.c:124
+#: ../providers/mysql/gda-mysql-handler-boolean.c:117
msgid "MySQL boolean representation"
msgstr "MySQL 布尔型表示"
-#: ../providers/mysql/gda-mysql-provider.c:494
+#: ../providers/mysql/gda-mysql-provider.c:505
msgid "Cannot give a UNIX SOCKET if you also provide either a HOST or a PORT"
msgstr "如果您已经给出了主机或端口，就不能再给定 UNIX 套接字。"
-#: ../providers/mysql/gda-mysql-provider.c:544
+#: ../providers/mysql/gda-mysql-provider.c:513
+#, fuzzy
+#| msgid "Invalid column number %d"
+msgid "Invalid port number"
+msgstr "无效的列号 %d"
+
+#: ../providers/mysql/gda-mysql-provider.c:548
+#, fuzzy, c-format
+#| msgid "Unknown provider '%s'"
+msgid "Unknown MySQL protocol '%s'"
+msgstr "未知的提供者 '%s'"
+
+#: ../providers/mysql/gda-mysql-provider.c:593
#, c-format
msgid ""
"Could not set client charset to UTF8. Using %s. It'll be problems with non "
"UTF-8 characters"
msgstr "无法设置客户端字符集为 UTF8。正在使用 %s。对于非 UTF-8 字符这将是问题"
-#: ../providers/mysql/gda-mysql-provider.c:600
+#: ../providers/mysql/gda-mysql-provider.c:649
msgid "The connection string must contain the DB_NAME values"
msgstr "连接字符串必须包含 DB_NAME 值"
-#: ../providers/mysql/gda-mysql-provider.c:638
-#: ../providers/mysql/gda-mysql-provider.c:672
+#: ../providers/mysql/gda-mysql-provider.c:689
+#: ../providers/mysql/gda-mysql-provider.c:724
#: ../providers/mysql/gda-mysql-util.c:65
msgid "No description"
msgstr "无描述"
-#: ../providers/mysql/gda-mysql-provider.c:1773
+#: ../providers/mysql/gda-mysql-provider.c:1861
msgid "Unnamed statement parameter is not allowed in prepared statement."
msgstr "准备就绪语句中不允许有未命名的语句参数。"
#. force reading the complete BLOB into memory
-#: ../providers/mysql/gda-mysql-provider.c:2533
+#: ../providers/mysql/gda-mysql-provider.c:2637
msgid "Can't read whole BLOB into memory"
msgstr "无法整个读取 BLOB 到内存"
-#: ../providers/mysql/gda-mysql-provider.c:2623
+#. there is an error here
+#: ../providers/mysql/gda-mysql-provider.c:2684
+#, fuzzy, c-format
+#| msgid ""
+#| "Can't obtain SQLite BLOB handle (reported type is '%s'), please report "
+#| "this bug to http://bugzilla.gnome.org/ for the \"libgda\" product."
+msgid ""
+"Unhandled data type '%s', please report this bug to http://bugzilla.gnome.";
+"org/ for the \"libgda\" product."
+msgstr ""
+"无法获取 SQLite BLOB 句柄 (报告的类型是 '%s')，请在 http://bugzilla.gnome.";
+"org/ 上为“libgda”产品报告这个 bug。"
+
+#: ../providers/mysql/gda-mysql-provider.c:2731
msgid ""
"Could not use CURSOR. Mysql version 5.0 at least is required. Using random "
"access anyway."
-msgstr ""
-"无法使用 CURSOR。至少需要 Mysql 的 5.0 版本。无论如何都可以使用随机访问。"
+msgstr "无法使用 CURSOR。至少需要 Mysql 的 5.0 版本。无论如何都可以使用随机访问。"
#: ../providers/mysql/gda-mysql-recordset.c:150
msgid ""
@@ -5669,10 +5829,10 @@ msgid "Number of row chunks read since the object creation"
msgstr "自从对象创建以来所读取的行块的数目"
#: ../providers/mysql/gda-mysql-recordset.c:673
-#: ../providers/mysql/gda-mysql-recordset.c:987
-#: ../providers/mysql/gda-mysql-recordset.c:1000
-#: ../providers/mysql/gda-mysql-recordset.c:1013
-#: ../providers/mysql/gda-mysql-recordset.c:1032
+#: ../providers/mysql/gda-mysql-recordset.c:989
+#: ../providers/mysql/gda-mysql-recordset.c:1002
+#: ../providers/mysql/gda-mysql-recordset.c:1015
+#: ../providers/mysql/gda-mysql-recordset.c:1034
#, c-format
msgid "Invalid column bind data type. %d\n"
msgstr "无效的列绑定数据类型。%d\n"
@@ -5687,18 +5847,18 @@ msgstr "没有为值 %2$d 映射类型 %1$s"
msgid "Type %s not mapped for value %lld"
msgstr "没有为值 %2$lld 映射类型 %1$s"
-#: ../providers/mysql/gda-mysql-recordset.c:893
+#: ../providers/mysql/gda-mysql-recordset.c:895
#, c-format
msgid "Type %s not mapped for value %d/%d/%d %d:%d:%d.%lu"
msgstr "类型 %s 没有为值 %d/%d/%d %d:%d:%d.%lu 所映射"
-#: ../providers/mysql/gda-mysql-recordset.c:910
-#: ../providers/mysql/gda-mysql-recordset.c:925
+#: ../providers/mysql/gda-mysql-recordset.c:912
+#: ../providers/mysql/gda-mysql-recordset.c:927
#, c-format
msgid "Type %s not mapped for value %f"
msgstr "没有为值 %2$f 映射类型 %1$s"
-#: ../providers/mysql/gda-mysql-recordset.c:1022
+#: ../providers/mysql/gda-mysql-recordset.c:1024
#, c-format
msgid "Type %s not mapped for value %s"
msgstr "没有为值 %2$s 映射类型 %1$s"
@@ -5784,246 +5944,296 @@ msgstr "登录名 (其有创建数据库的权利)"
msgid "Administrator password"
msgstr "管理员口令"
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:15
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:15
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:13
+#, fuzzy
+#| msgid "Connection properties"
+msgid "Connection protocol"
+msgstr "连接属性"
+
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:16
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:16
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:14
+msgid ""
+"Explicitly specifies a connection protocol to use. It is useful when the "
+"other connection parameters normally would cause a protocol to be used other "
+"than the one you want"
+msgstr ""
+
#. DSN parameters
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:24
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:26
msgid "Create database only if it does not yet exist"
msgstr "只创建尚不存在的数据库"
#. DSN parameters
#. other table options
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:26
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:28
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:73
msgid "Character set"
msgstr "字符集"
#. DSN parameters
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:28
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:30
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:21
msgid "Character set encoding to use in the new database"
msgstr "在新数据库中使用的字符集编码"
#. DSN parameters
#. other table options
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:30
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:32
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:75
msgid "Collation"
msgstr "排序规则"
#. DSN parameters
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:32
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:34
msgid "Collation method to use in the new database"
msgstr "要在新数据库中使用的排序方法"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:34
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:36
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:131
msgid "UTF-8 Unicode"
msgstr "UTF-8 Unicode"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:36
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:38
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:133
msgid "ISO 8859-1 West European"
msgstr "ISO 8859-1 西欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:38
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:40
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:135
msgid "ISO 8859-2 Central European"
msgstr "ISO 8859-2 中欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:40
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:42
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:137
msgid "US ASCII"
msgstr "US ASCII"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:42
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:44
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:139
msgid "Big5 Traditional Chinese"
msgstr "Big5 正体中文"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:44
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:46
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:141
msgid "DEC West European"
msgstr "DEC 西欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:46
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:48
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:143
msgid "DOS West European"
msgstr "DOS 西欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:48
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:50
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:145
msgid "HP West European"
msgstr "HP 西欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:50
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:52
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:147
msgid "KOI8-R Relcom Russian"
-msgstr ""
+msgstr "KOI8-R Relcom Russian"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:52
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:54
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:149
msgid "7bit Swedish"
msgstr "7位 瑞典语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:54
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:56
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:151
msgid "EUC-JP Japanese"
msgstr "EUC-JP 日语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:56
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:58
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:153
msgid "Shift-JIS Japanese"
msgstr "Shift-JIS 日语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:58
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:60
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:155
msgid "ISO 8859-8 Hebrew"
msgstr "ISO 8859-8 希伯来语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:60
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:62
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:157
msgid "TIS620 Thai"
msgstr "TIS620 日语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:62
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:64
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:159
msgid "EUC-KR Korean"
msgstr "EUC-KR 朝鲜语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:64
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:66
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:161
msgid "KOI8-U Ukrainian"
msgstr "KOI8-U 乌克兰文"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:66
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:68
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:163
msgid "GB2312 Simplified Chinese"
msgstr "GB2312 简体中文"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:68
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:70
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:165
msgid "ISO 8859-7 Greek"
msgstr "ISO 8859-7 希腊语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:70
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:72
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:167
msgid "Windows Central European"
msgstr "Windows 中欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:72
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:74
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:169
msgid "GBK Simplified Chinese"
msgstr "GBK 简体中文"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:74
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:76
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:171
msgid "ISO 8859-9 Turkish"
msgstr "ISO 8859-9 土耳其文"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:76
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:78
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:173
msgid "ARMSCII-8 Armenian"
msgstr "ARMSCII-8 亚美尼亚语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:78
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:80
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:175
msgid "UCS-2 Unicode"
msgstr "UCS-2 Unicode"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:80
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:82
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:177
msgid "DOS Russian"
msgstr "DOS 俄语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:82
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:84
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:179
msgid "DOS Kamenicky Czech-Slovak"
-msgstr ""
+msgstr "DOS Kamenicky Czech-Slovak"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:84
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:86
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:181
msgid "Mac Central European"
msgstr "Mac 中欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:86
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:88
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:183
msgid "Mac West European"
msgstr "Mac 西欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:88
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:90
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:185
msgid "DOS Central European"
msgstr "DOS 中欧"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:90
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:92
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:187
msgid "ISO 8859-13 Baltic"
msgstr "ISO 8859-13 波罗的海"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:92
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:94
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:189
msgid "Windows Cyrillic"
msgstr "Windows 西里尔语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:94
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:96
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:191
msgid "Windows Arabic"
msgstr "Windows 阿拉伯语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:96
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:98
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:193
msgid "Windows Baltic"
msgstr "Windows 波罗的海"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:98
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:100
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:195
msgid "Binary pseudo charset"
msgstr "二进制伪字符集"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:100
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:102
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:197
msgid "GEOSTD8 Georgian"
msgstr "GEOSTD8 格鲁吉亚语"
#. To translators: Charset name
-#: ../providers/mysql/mysql_specs_create_db.xml.in.h:102
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:104
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:199
msgid "SJIS for Windows Japanese"
msgstr "Windows 日语的 SJIS"
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:105
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:27
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:15
+msgid "Automatic"
+msgstr "自动"
+
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:106
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:28
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:16
+msgid "TCP: TCP/IP connection to local or remote server."
+msgstr ""
+
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:107
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:29
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:17
+msgid ""
+"Socket: Unix socket file connection to local server (Local Unix server only)."
+msgstr ""
+
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:108
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:30
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:18
+msgid ""
+"Pipe: Named-pipe connection to local or remote server (Windows server only)"
+msgstr ""
+
+#: ../providers/mysql/mysql_specs_create_db.xml.in.h:109
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:31
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:19
+msgid ""
+"Memory: Shared-memory connection to local server (Local Windows server only)"
+msgstr ""
+
#: ../providers/mysql/mysql_specs_create_index.xml.in.h:6
#: ../providers/postgres/postgres_specs_create_index.xml.in.h:6
msgid "Method"
@@ -6053,7 +6263,7 @@ msgstr "表注释"
#: ../providers/postgres/postgres_specs_create_table.xml.in.h:41
#: ../tools/browser/canvas/browser-canvas-fkey.c:422
#: ../tools/browser/schema-browser/mgr-columns.c:385
-#: ../tools/command-exec.c:1386
+#: ../tools/command-exec.c:881
msgid "Foreign key"
msgstr "外键"
@@ -6273,7 +6483,7 @@ msgid "Comma Separated Value (CSV)"
msgstr "逗号分隔的值(CSV)"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:118
-#: ../tools/command-exec.c:462 ../tools/command-exec.c:532
+#: ../tools/cmdtool/tool-help.c:251 ../tools/cmdtool/tool-help.c:327
msgid "Example"
msgstr "例子"
@@ -6341,12 +6551,12 @@ msgid "column name"
msgstr "列名"
#. DSN parameters
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:22
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:24
msgid "Only if existing"
msgstr "只有存在时"
#. DSN parameters
-#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:24
+#: ../providers/mysql/mysql_specs_drop_db.xml.in.h:26
#, fuzzy
msgid "Drop database only if it exists"
msgstr "只在数据库存在的情况下丢弃它"
@@ -6384,11 +6594,6 @@ msgstr "自动丢弃依赖该表的对象(CASCADE)"
msgid "Refuse to drop the table if any objects depend on it (RESTRICT)"
msgstr "如果任何对象依赖该表，则拒绝丢弃它(RESTRICT)"
-#: ../providers/mysql/mysql_specs_dsn.xml.in.h:2
-#: ../providers/postgres/postgres_specs_dsn.xml.in.h:2
-msgid "The name of a database to connect to"
-msgstr "要连接到的数据库的名称"
-
#: ../providers/mysql/mysql_specs_dsn.xml.in.h:11
msgid "Compress"
msgstr "压缩"
@@ -6423,96 +6628,100 @@ msgstr "无法参数句柄"
msgid "Could not get attribute"
msgstr "无法获得属性"
-#: ../providers/oracle/gda-oracle-util.c:69
+#: ../providers/oracle/gda-oracle-util.c:70
msgid "NO DESCRIPTION"
msgstr "没有描述"
-#: ../providers/oracle/gda-oracle-util.c:625
+#: ../providers/oracle/gda-oracle-util.c:626
msgid "Invalid Oracle handle"
msgstr "无效的 Oracle 句柄"
-#: ../providers/oracle/gda-oracle-util.c:633
+#: ../providers/oracle/gda-oracle-util.c:634
msgid "Could not allocate Lob locator"
msgstr "无法指定 Lob 定位器"
-#: ../providers/oracle/gda-oracle-util.c:640
+#: ../providers/oracle/gda-oracle-util.c:641
msgid "Could not copy Lob locator"
msgstr "无法复制 Lob 定位器"
-#: ../providers/postgres/gda-postgres-handler-bin.c:122
-msgid "Postgresql binary handler"
-msgstr "Postgresql 二进制处理程序"
-
-#: ../providers/postgres/gda-postgres-handler-bin.c:128
+#: ../providers/postgres/gda-postgres-handler-bin.c:119
msgid "PostgresqlBin"
msgstr "PostgresqlBin"
-#: ../providers/postgres/gda-postgres-handler-bin.c:129
+#: ../providers/postgres/gda-postgres-handler-bin.c:120
msgid "PostgreSQL binary representation"
msgstr "PostgreSQL 二进制表示"
-#: ../providers/postgres/gda-postgres-handler-bin.c:218
+#: ../providers/postgres/gda-postgres-handler-bin.c:204
msgid "Insufficient memory to convert binary buffer to string"
msgstr "没有足够的内存来执行二进制缓存到字符串的转换"
-#: ../providers/postgres/gda-postgres-handler-bin.c:281
+#: ../providers/postgres/gda-postgres-handler-bin.c:244
msgid "Insufficient memory to convert string to binary buffer"
msgstr "没有足够的内存来执行字符串到二进制缓存的转换"
-#: ../providers/postgres/gda-postgres-provider.c:433
+#: ../providers/postgres/gda-postgres-provider.c:524
+#, fuzzy
+#| msgid "could not determine the indexed columns for index"
+msgid "Could not determine the default date format"
+msgstr "无法为索引决定索引列"
+
+#: ../providers/postgres/gda-postgres-provider.c:580
msgid "The connection string must contain a DB_NAME value"
msgstr "连接字符串必须包含 DB_NAME 值"
-#: ../providers/postgres/gda-postgres-provider.c:437
+#: ../providers/postgres/gda-postgres-provider.c:584
msgid ""
"The connection string format has changed: replace DATABASE with DB_NAME and "
"the same contents"
msgstr "连接字符串已经更改：使用 DB_NAME 和同样内容替换了 DATABASE"
-#: ../providers/postgres/gda-postgres-provider.c:565
+#: ../providers/postgres/gda-postgres-provider.c:724
#, c-format
msgid "Could not set search_path to %s"
msgstr "无法设置 search_path 到 %s"
-#: ../providers/postgres/gda-postgres-provider.c:574
+#: ../providers/postgres/gda-postgres-provider.c:733
#, c-format
msgid "Search path %s is invalid"
msgstr "搜索路径 %s 无效"
-#: ../providers/postgres/gda-postgres-provider.c:1015
-#: ../providers/postgres/gda-postgres-provider.c:1017
+#: ../providers/postgres/gda-postgres-provider.c:1174
+#: ../providers/postgres/gda-postgres-provider.c:1176
msgid "Transactions are not supported in read uncommitted isolation level"
msgstr ""
-#: ../providers/postgres/gda-postgres-provider.c:1021
-#: ../providers/postgres/gda-postgres-provider.c:1023
+#: ../providers/postgres/gda-postgres-provider.c:1180
+#: ../providers/postgres/gda-postgres-provider.c:1182
msgid "Transactions are not supported in repeatable read isolation level"
msgstr ""
-#: ../providers/postgres/gda-postgres-provider.c:1040
-#: ../providers/postgres/gda-postgres-provider.c:1138
-#: ../providers/postgres/gda-postgres-provider.c:1188
-#: ../providers/postgres/gda-postgres-provider.c:1238
+#: ../providers/postgres/gda-postgres-provider.c:1199
+#: ../providers/postgres/gda-postgres-provider.c:1297
+#: ../providers/postgres/gda-postgres-provider.c:1347
+#: ../providers/postgres/gda-postgres-provider.c:1397
#: ../providers/postgres/gda-postgres-recordset.c:446
#: ../providers/postgres/gda-postgres-recordset.c:474
+#: ../providers/postgres/gda-postgres-recordset.c:630
+#: ../providers/postgres/gda-postgres-recordset.c:698
msgid "Internal error"
msgstr "内部错误"
-#: ../providers/postgres/gda-postgres-provider.c:1144
-#: ../providers/postgres/gda-postgres-provider.c:1194
-#: ../providers/postgres/gda-postgres-provider.c:1244
+#: ../providers/postgres/gda-postgres-provider.c:1303
+#: ../providers/postgres/gda-postgres-provider.c:1353
+#: ../providers/postgres/gda-postgres-provider.c:1403
#, c-format
msgid "Wrong savepoint name '%s'"
msgstr "错误的保存点 (savepoint) 名称 '%s'"
-#: ../providers/postgres/gda-postgres-provider.c:2079
-#: ../providers/postgres/gda-postgres-provider.c:2081
+#: ../providers/postgres/gda-postgres-provider.c:2263
+#: ../providers/postgres/gda-postgres-provider.c:2265
msgid "Cannot start transaction"
msgstr "无法启动事务"
-#: ../providers/postgres/gda-postgres-provider.c:2288
-#: ../providers/postgres/gda-postgres-provider.c:2324
-#: ../providers/postgres/gda-postgres-provider.c:2359
+#: ../providers/postgres/gda-postgres-provider.c:2524
+#: ../providers/postgres/gda-postgres-provider.c:2560
+#: ../providers/postgres/gda-postgres-provider.c:2595
msgid "Could not set the XA transaction ID parameter"
msgstr "无法设置 XA 事务 ID 参数"
@@ -6520,7 +6729,19 @@ msgstr "无法设置 XA 事务 ID 参数"
msgid "Number of rows chunks read since the object creation"
msgstr "自从对象创建以来所读取的行块的数目"
-#: ../providers/postgres/gda-postgres-recordset.c:747
+#: ../providers/postgres/gda-postgres-recordset.c:624
+#, fuzzy, c-format
+#| msgid "Invalid UTF-8 format!"
+msgid "Invalid date format '%s'"
+msgstr "无效的 UTF-8 格式！"
+
+#: ../providers/postgres/gda-postgres-recordset.c:692
+#, fuzzy, c-format
+#| msgid "Invalid referenced table name '%s'"
+msgid "Invalid timestamp value '%s'"
+msgstr "无效的引用表名 '%s'"
+
+#: ../providers/postgres/gda-postgres-recordset.c:770
#, c-format
msgid "Invalid binary string representation '%s ...'"
msgstr "无效的二进制字符串表示“%s ...”"
@@ -6573,7 +6794,7 @@ msgid "Whether to require SSL or not when connecting"
msgstr "连接时是否要求 SSL"
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:22
-#: ../tools/command-exec.c:1096
+#: ../tools/command-exec.c:588
msgid "Owner"
msgstr "属主"
@@ -7152,19 +7373,31 @@ msgstr "搜索路径"
msgid "Search path among database's schemas ('search_path' variable)"
msgstr "数据库方案中的搜索路径 ('search_path' 变量)"
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:780
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:843
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1051
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1120
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1194
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1503
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1580
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1623
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1703
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1803
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1842
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1894
-#: ../providers/reuseable/mysql/gda-mysql-meta.c:1933
+#: ../providers/postgres/postgres_specs_dsn.xml.in.h:13
+#, fuzzy
+#| msgid "Connections list"
+msgid "Connection timeout"
+msgstr "连接列表"
+
+#: ../providers/postgres/postgres_specs_dsn.xml.in.h:14
+msgid ""
+"Maximum wait for connection, in seconds. Zero or not specified means wait "
+"indefinitely. It is not recommended to use a timeout of less than 2 seconds"
+msgstr ""
+
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:782
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:845
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1053
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1122
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1196
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1505
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1582
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1625
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1705
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1805
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1844
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1896
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1935
msgid "Mysql version 5.0 at least is required"
msgstr "至少需要 Mysql 5.0 版"
@@ -7172,11 +7405,11 @@ msgstr "至少需要 Mysql 5.0 版"
#: ../providers/reuseable/mysql/gda-mysql-reuseable.c:216
#: ../providers/reuseable/postgres/gda-postgres-reuseable.c:200
#: ../providers/web/gda-web-meta.c:105
-#: ../providers/web/gda-web-recordset.c:311
+#: ../providers/web/gda-web-recordset.c:310
msgid "Can't import data from web server"
msgstr "无法从网页服务器导入数据"
-#: ../providers/reuseable/postgres/gda-postgres-meta.c:2115
+#: ../providers/reuseable/postgres/gda-postgres-meta.c:2122
msgid "could not determine the indexed columns for index"
msgstr "无法为索引决定索引列"
@@ -7200,42 +7433,42 @@ msgstr "加密口令"
msgid "Provider for SQLite databases"
msgstr "SQLite 数据库的提供者"
-#: ../providers/web/gda-web-provider.c:290 ../providers/web/gda-web-util.c:293
-#: ../providers/web/gda-web-util.c:420 ../providers/web/gda-web-util.c:573
+#: ../providers/web/gda-web-provider.c:291 ../providers/web/gda-web-util.c:293
+#: ../providers/web/gda-web-util.c:411 ../providers/web/gda-web-util.c:564
#, c-format
msgid "Invalid HOST/SCRIPT '%s'"
msgstr "无效的 HOST/SCRIPT '%s'"
-#: ../providers/web/gda-web-provider.c:352
-#: ../providers/web/gda-web-provider.c:358
-#: ../providers/web/gda-web-provider.c:364
-#: ../providers/web/gda-web-provider.c:372
+#: ../providers/web/gda-web-provider.c:353
+#: ../providers/web/gda-web-provider.c:359
+#: ../providers/web/gda-web-provider.c:365
+#: ../providers/web/gda-web-provider.c:373
#, c-format
msgid "The connection string must contain the %s value"
msgstr "连接字符串必须包含 %s 值"
-#: ../providers/web/gda-web-provider.c:631
-#: ../providers/web/gda-web-provider.c:660
+#: ../providers/web/gda-web-provider.c:632
+#: ../providers/web/gda-web-provider.c:661
msgid "Not supported"
msgstr "不支持"
-#: ../providers/web/gda-web-provider.c:638
-#: ../providers/web/gda-web-provider.c:667
+#: ../providers/web/gda-web-provider.c:639
+#: ../providers/web/gda-web-provider.c:668
msgid "Server operations not yet implemented"
msgstr "服务器操作尚未实现"
-#: ../providers/web/gda-web-provider.c:718
-#: ../providers/web/gda-web-provider.c:783
-#: ../providers/web/gda-web-provider.c:843
+#: ../providers/web/gda-web-provider.c:719
+#: ../providers/web/gda-web-provider.c:784
+#: ../providers/web/gda-web-provider.c:844
msgid "Named transaction is not supported"
msgstr "不支持命名事务"
-#: ../providers/web/gda-web-provider.c:723
+#: ../providers/web/gda-web-provider.c:724
msgid "Transaction level is not supported"
msgstr "不支持事务级别"
-#: ../providers/web/gda-web-provider.c:903
-#: ../providers/web/gda-web-provider.c:964
+#: ../providers/web/gda-web-provider.c:904
+#: ../providers/web/gda-web-provider.c:965
msgid "Unnamed savepoint is not supported"
msgstr "不支持未命名的保存点(savepoint)"
@@ -7247,24 +7480,24 @@ msgstr "无法解析服务器反应"
msgid "Invalid response hash"
msgstr "无效的响应散列"
-#: ../providers/web/gda-web-util.c:345 ../providers/web/gda-web-util.c:352
+#: ../providers/web/gda-web-util.c:344
msgid "Can't start new thread"
msgstr "无法启动新线程"
-#: ../providers/web/gda-web-util.c:407 ../providers/web/gda-web-util.c:447
+#: ../providers/web/gda-web-util.c:398 ../providers/web/gda-web-util.c:438
msgid "Could not run PHP script on the server"
msgstr "无法在服务器上运行 PHP 脚本"
-#: ../providers/web/gda-web-util.c:434
+#: ../providers/web/gda-web-util.c:425
msgid "The transaction has been automatically rolled back"
msgstr "事务已经自动回滚"
-#: ../providers/web/gda-web-util.c:584
+#: ../providers/web/gda-web-util.c:575
#, c-format
msgid "Error cleaning data on the server for session %s"
msgstr "在服务器上为会话 %s 清理数据出错"
-#: ../providers/web/gda-web-util.c:616
+#: ../providers/web/gda-web-util.c:607
msgid "Non detailled error"
msgstr "无更详细的错误"
@@ -7342,47 +7575,47 @@ msgstr ""
"无法打开连接：\n"
"%s"
-#: ../tools/browser/browser-connection.c:393
+#: ../tools/browser/browser-connection.c:383
#, c-format
msgid "c%u"
msgstr "c%u"
-#: ../tools/browser/browser-connection.c:506
+#: ../tools/browser/browser-connection.c:494
msgid "Analysing database schema"
msgstr "正在分析数据库方案"
-#: ../tools/browser/browser-connection.c:508
-#: ../tools/browser/browser-connection.c:668
-#: ../tools/browser/browser-connection.c:685
-#: ../tools/browser/browser-connection.c:1153
+#: ../tools/browser/browser-connection.c:496
+#: ../tools/browser/browser-connection.c:653
+#: ../tools/browser/browser-connection.c:670
+#: ../tools/browser/browser-connection.c:1144
#, c-format
msgid "Error while fetching meta data from the connection: %s"
msgstr "从连接中获取元数据出错：%s"
-#: ../tools/browser/browser-connection.c:864
-#: ../tools/browser/browser-connection.c:884
+#: ../tools/browser/browser-connection.c:855
+#: ../tools/browser/browser-connection.c:875
#, c-format
msgid "Error while analysing database schema: %s"
msgstr "分析数据库方案时出错：%s"
-#: ../tools/browser/browser-connection.c:1017
+#: ../tools/browser/browser-connection.c:1008
#: ../tools/browser/browser-window.c:280
msgid "Connection"
msgstr "连接"
-#: ../tools/browser/browser-connection.c:1019
+#: ../tools/browser/browser-connection.c:1010
msgid "unnamed"
msgstr "未命名的"
-#: ../tools/browser/browser-connection.c:1022
+#: ../tools/browser/browser-connection.c:1013
msgid "data source"
msgstr "数据源"
-#: ../tools/browser/browser-connection.c:1151
+#: ../tools/browser/browser-connection.c:1142
msgid "Getting database schema information"
msgstr "正在获取数据库方案信息"
-#: ../tools/browser/browser-connection.c:1367
+#: ../tools/browser/browser-connection.c:1358
msgid ""
"Execution reported an undefined error, please report error to http://";
"bugzilla.gnome.org/ for the \"libgda\" product"
@@ -7390,45 +7623,45 @@ msgstr ""
"执行时出现了一个未定义的错误。请向http://bugzilla.gnome.org/ 汇报“libgda”产品"
"的错误"
-#: ../tools/browser/browser-connection.c:1418
-#: ../tools/browser/browser-connection.c:1468
+#: ../tools/browser/browser-connection.c:1409
+#: ../tools/browser/browser-connection.c:1459
msgid "Executing a query"
msgstr "执行一个查询"
-#: ../tools/browser/browser-connection.c:1765
+#: ../tools/browser/browser-connection.c:1756
msgid "Connection not yet opened"
msgstr "连接尚未打开"
-#: ../tools/browser/browser-connection.c:1771
+#: ../tools/browser/browser-connection.c:1762
msgid "Can't initialize dictionary to store table preferences"
msgstr "无法初始化保存表首选项的字典"
-#: ../tools/browser/browser-connection.c:1817
-#: ../tools/browser/browser-connection.c:1823
-#: ../tools/browser/browser-connection.c:1959 ../tools/tools-favorites.c:629
+#: ../tools/browser/browser-connection.c:1808
+#: ../tools/browser/browser-connection.c:1814
+#: ../tools/browser/browser-connection.c:1950 ../tools/tools-favorites.c:629
#: ../tools/tools-favorites.c:635 ../tools/tools-favorites.c:1062
#: ../tools/tools-favorites.c:1069
msgid "Can't initialize transaction to access favorites"
msgstr "无法初始化用以访问收藏的事务"
-#: ../tools/browser/browser-connection.c:1904 ../tools/tools-favorites.c:808
+#: ../tools/browser/browser-connection.c:1895 ../tools/tools-favorites.c:808
#: ../tools/tools-favorites.c:1137
msgid "Can't commit transaction to access favorites"
msgstr "无法提交事务以访问收藏"
-#: ../tools/browser/browser-connection.c:2467
+#: ../tools/browser/browser-connection.c:2458
msgid "Could not execute LDAP search"
msgstr "无法执行 LDAP 搜索"
-#: ../tools/browser/browser-connection.c:2512
+#: ../tools/browser/browser-connection.c:2503
msgid "Executing LDAP search"
msgstr "执行 LDAP 搜索"
-#: ../tools/browser/browser-connection.c:2572
+#: ../tools/browser/browser-connection.c:2563
msgid "Fetching LDAP entry's attributes"
msgstr "正在获取 LDAP 记录的属性"
-#: ../tools/browser/browser-connection.c:2632
+#: ../tools/browser/browser-connection.c:2623
msgid "Fetching LDAP entry's children"
msgstr "正在获取 LDAP 记录的子对象"
@@ -7464,11 +7697,11 @@ msgstr "用于保存与此连接关联的任何信息(收藏、描述、...)的
msgid "Opened connections"
msgstr "打开的连接"
-#: ../tools/browser/browser-connections-list.c:356 ../tools/gda-sql.c:3575
+#: ../tools/browser/browser-connections-list.c:356 ../tools/gda-sql.c:2983
msgid "List of opened connections"
msgstr "列出打开的连接"
-#: ../tools/browser/browser-connections-list.c:365 ../tools/web-server.c:708
+#: ../tools/browser/browser-connections-list.c:365 ../tools/web-server.c:714
msgid "Connections"
msgstr "连接"
@@ -7564,7 +7797,9 @@ msgid "Open a connection"
msgstr "打开连接"
#: ../tools/browser/browser-window.c:282
-msgid "_Bind connection"
+#, fuzzy
+#| msgid "_Bind connection"
+msgid "_Bind Connection"
msgstr "绑定连接(_B)"
#: ../tools/browser/browser-window.c:282
@@ -7582,7 +7817,9 @@ msgid "Connection properties"
msgstr "连接属性"
#: ../tools/browser/browser-window.c:286
-msgid "_Connections list"
+#, fuzzy
+#| msgid "_Connections list"
+msgid "_Connections List"
msgstr "连接列表(_C)"
#: ../tools/browser/browser-window.c:286
@@ -7590,7 +7827,9 @@ msgid "Connections list"
msgstr "连接列表"
#: ../tools/browser/browser-window.c:287
-msgid "_Fetch meta data"
+#, fuzzy
+#| msgid "_Fetch meta data"
+msgid "_Fetch Meta Data"
msgstr "获取元数据(_F)"
#: ../tools/browser/browser-window.c:287
@@ -7598,7 +7837,9 @@ msgid "Fetch meta data"
msgstr "获取元数据"
#: ../tools/browser/browser-window.c:288
-msgid "_Close connection"
+#, fuzzy
+#| msgid "_Close connection"
+msgid "_Close Connection"
msgstr "关闭连接(_C)"
#: ../tools/browser/browser-window.c:288
@@ -7609,7 +7850,7 @@ msgstr "关闭此连接"
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../tools/browser/browser-window.c:289 ../tools/gda-sql.c:2631
+#: ../tools/browser/browser-window.c:289 ../tools/gda-sql.c:2196
msgid "Quit"
msgstr "退出"
@@ -7646,7 +7887,9 @@ msgid "Window"
msgstr "窗口"
#: ../tools/browser/browser-window.c:294
-msgid "_New window"
+#, fuzzy
+#| msgid "_New window"
+msgid "_New Window"
msgstr "新窗口(_N)"
#: ../tools/browser/browser-window.c:294
@@ -7654,7 +7897,9 @@ msgid "Open a new window for current connection"
msgstr "为当前连接打开一个新窗口"
#: ../tools/browser/browser-window.c:295
-msgid "New window for _connection"
+#, fuzzy
+#| msgid "New window for _connection"
+msgid "New Window for _Connection"
msgstr "连接的新窗口(_C)"
#: ../tools/browser/browser-window.c:295
@@ -7666,7 +7911,7 @@ msgid "_Help"
msgstr "帮助(_H)"
#: ../tools/browser/browser-window.c:297
-#: ../tools/browser/data-manager/data-console.c:423
+#: ../tools/browser/data-manager/data-console.c:420
msgid "Help"
msgstr "帮助"
@@ -7691,9 +7936,9 @@ msgid "Rollback current transaction"
msgstr "回滚当前事务"
#: ../tools/browser/browser-window.c:516 ../tools/browser/browser-window.c:571
-#: ../tools/browser/common/ui-formgrid.c:850
+#: ../tools/browser/common/ui-formgrid.c:851
#: ../tools/browser/ldap-browser/perspective-main.c:33
-#: ../tools/browser/schema-browser/table-columns.c:972
+#: ../tools/browser/schema-browser/table-columns.c:975
msgid "LDAP browser"
msgstr "LDAP 浏览器"
@@ -7762,35 +8007,35 @@ msgstr ""
"当前透视已更改为“%s”透视，您可以通过“透视/%s”菜单改回上个透视，或使用“%s”快捷"
"键"
-#: ../tools/browser/canvas/browser-canvas.c:371
+#: ../tools/browser/canvas/browser-canvas.c:353
msgid "Linear layout"
msgstr "线性布局"
-#: ../tools/browser/canvas/browser-canvas.c:376
+#: ../tools/browser/canvas/browser-canvas.c:358
msgid "Radial layout"
msgstr "径向布局"
-#: ../tools/browser/canvas/browser-canvas.c:483
+#: ../tools/browser/canvas/browser-canvas.c:465
msgid "Save diagram as"
msgstr "保存图示为"
-#: ../tools/browser/canvas/browser-canvas.c:491
+#: ../tools/browser/canvas/browser-canvas.c:473
msgid "PNG Image"
msgstr "PNG 图像"
-#: ../tools/browser/canvas/browser-canvas.c:496
+#: ../tools/browser/canvas/browser-canvas.c:478
msgid "SVG file"
msgstr "SVG 文件"
-#: ../tools/browser/canvas/browser-canvas.c:534
+#: ../tools/browser/canvas/browser-canvas.c:516
msgid "Failed to create SVG file"
msgstr "创建 SVG 文件失败"
-#: ../tools/browser/canvas/browser-canvas.c:542
+#: ../tools/browser/canvas/browser-canvas.c:524
msgid "File format to save to is not recognized."
msgstr "要保存到的文件格式未能识别。"
-#: ../tools/browser/canvas/browser-canvas.c:562
+#: ../tools/browser/canvas/browser-canvas.c:544
msgid "Failed to create PNG file"
msgstr "创建 PNG 文件失败"
@@ -7816,15 +8061,15 @@ msgid "Declare foreign key for this table"
msgstr "为此表声明外键"
#: ../tools/browser/canvas/browser-canvas-db-relations.c:422
-#: ../tools/browser/schema-browser/table-info.c:971
+#: ../tools/browser/schema-browser/table-info.c:972
#, c-format
msgid "Failed to declare foreign key: %s"
msgstr "声明外键失败：%s"
#: ../tools/browser/canvas/browser-canvas-db-relations.c:429
#: ../tools/browser/canvas/browser-canvas-db-relations.c:432
-#: ../tools/browser/schema-browser/table-info.c:978
-#: ../tools/browser/schema-browser/table-info.c:981
+#: ../tools/browser/schema-browser/table-info.c:979
+#: ../tools/browser/schema-browser/table-info.c:982
msgid "Successfully declared foreign key"
msgstr "成功声明了外键"
@@ -7846,39 +8091,39 @@ msgstr "添加所有表"
msgid "Add all tables in schema"
msgstr "添加方案中的所有表"
-#: ../tools/browser/canvas/browser-canvas-db-relations.c:828
+#: ../tools/browser/canvas/browser-canvas-db-relations.c:830
msgid "Select tables to add to diagram"
msgstr "选择要添加到图示中的表"
#: ../tools/browser/canvas/browser-canvas-fkey.c:422
-#: ../tools/command-exec.c:1384
+#: ../tools/command-exec.c:879
msgid "Declared foreign key"
msgstr "已声明外键"
#. To translators: the UPDATE is an SQL operation type
#: ../tools/browser/canvas/browser-canvas-fkey.c:424
-#: ../tools/browser/schema-browser/table-columns.c:356
-#: ../tools/command-exec.c:1416
+#: ../tools/browser/schema-browser/table-columns.c:357
+#: ../tools/command-exec.c:911
msgid "Policy on UPDATE"
msgstr "UPDATE 时的策略"
#. To translators: the DELETE is an SQL operation type
#: ../tools/browser/canvas/browser-canvas-fkey.c:426
-#: ../tools/browser/schema-browser/table-columns.c:366
-#: ../tools/command-exec.c:1420
+#: ../tools/browser/schema-browser/table-columns.c:367
+#: ../tools/command-exec.c:915
msgid "Policy on DELETE"
msgstr "DELETE 时的策略"
#: ../tools/browser/canvas/browser-canvas-fkey.c:473
-#: ../tools/browser/schema-browser/table-columns.c:948
+#: ../tools/browser/schema-browser/table-columns.c:951
#, c-format
msgid "Failed to undeclare foreign key: %s"
msgstr "无法解除声明外键：%s"
#: ../tools/browser/canvas/browser-canvas-fkey.c:480
#: ../tools/browser/canvas/browser-canvas-fkey.c:483
-#: ../tools/browser/schema-browser/table-columns.c:955
#: ../tools/browser/schema-browser/table-columns.c:958
+#: ../tools/browser/schema-browser/table-columns.c:961
msgid "Successfully undeclared foreign key"
msgstr "成功解除了外键声明"
@@ -7928,7 +8173,7 @@ msgid "Print page numbers"
msgstr "打印页码"
#: ../tools/browser/common/fk-declare.c:186
-#: ../tools/browser/common/fk-declare.c:399
+#: ../tools/browser/common/fk-declare.c:398
#, c-format
msgid "Declare a foreign key for table '%s'"
msgstr "为表“%s”声明一个外键"
@@ -7940,24 +8185,24 @@ msgid ""
"and which column each one references"
msgstr "定义哪张表是参考的，哪些列是外键的一部分，及各表引用了哪一列"
-#: ../tools/browser/common/fk-declare.c:209
+#: ../tools/browser/common/fk-declare.c:208
msgid "Foreign key name:"
msgstr "外键名："
#. table to reference
-#: ../tools/browser/common/fk-declare.c:220
+#: ../tools/browser/common/fk-declare.c:219
msgid "Referenced table:"
msgstr "引用的表："
-#: ../tools/browser/common/fk-declare.c:263
+#: ../tools/browser/common/fk-declare.c:262
msgid "Referenced column"
msgstr "引用的列"
-#: ../tools/browser/common/fk-declare.c:561
+#: ../tools/browser/common/fk-declare.c:560
msgid "Missing information to declare foreign key"
msgstr "缺少声明外键所需的信息"
-#: ../tools/browser/common/fk-declare.c:643
+#: ../tools/browser/common/fk-declare.c:642
msgid "Missing information to undeclare foreign key"
msgstr "缺少解除声明外键所需的信息"
@@ -8082,43 +8327,43 @@ msgid_plural "%d Tables in schema '%s':"
msgstr[0] "方案 '%2$s' 中的 %1$d 表："
#. no connection at all or not authenticated
-#: ../tools/browser/common/objects-cloud.c:268 ../tools/web-server.c:713
+#: ../tools/browser/common/objects-cloud.c:268 ../tools/web-server.c:719
msgid "None"
msgstr "无"
-#: ../tools/browser/common/ui-formgrid.c:345
+#: ../tools/browser/common/ui-formgrid.c:346
msgid "Enable or disable auto update of data"
msgstr "启用或禁用自动更新数据"
-#: ../tools/browser/common/ui-formgrid.c:363
+#: ../tools/browser/common/ui-formgrid.c:364
msgid "Toggle between grid and form presentations"
msgstr "在网格和表单表示之间切换"
-#: ../tools/browser/common/ui-formgrid.c:504
+#: ../tools/browser/common/ui-formgrid.c:505
msgid "Execute action"
msgstr "执行操作"
-#: ../tools/browser/common/ui-formgrid.c:552
+#: ../tools/browser/common/ui-formgrid.c:553
msgid "View LDAP entry's details"
msgstr "查看 LDAP 记录详情"
-#: ../tools/browser/common/ui-formgrid.c:567
-#: ../tools/browser/common/ui-formgrid.c:578
+#: ../tools/browser/common/ui-formgrid.c:568
+#: ../tools/browser/common/ui-formgrid.c:579
#: ../tools/browser/data-manager/data-source-editor.c:112
msgid "Zoom..."
msgstr "缩放..."
-#: ../tools/browser/common/ui-formgrid.c:655
+#: ../tools/browser/common/ui-formgrid.c:656
#: ../tools/browser/data-manager/data-source.c:812
msgid "Statement to execute is not a selection statement"
msgstr "要执行的语句不是一条选择语句"
-#: ../tools/browser/common/ui-formgrid.c:663
-#: ../tools/browser/common/ui-formgrid.c:691
-#: ../tools/browser/common/ui-formgrid.c:722
-#: ../tools/browser/query-exec/query-console-page.c:1045
-#: ../tools/browser/query-exec/query-console-page.c:1075
-#: ../tools/browser/schema-browser/table-info.c:520
+#: ../tools/browser/common/ui-formgrid.c:664
+#: ../tools/browser/common/ui-formgrid.c:692
+#: ../tools/browser/common/ui-formgrid.c:723
+#: ../tools/browser/query-exec/query-console-page.c:1048
+#: ../tools/browser/query-exec/query-console-page.c:1078
+#: ../tools/browser/schema-browser/table-info.c:521
#, c-format
msgid ""
"Error executing query:\n"
@@ -8127,12 +8372,12 @@ msgstr ""
"执行查询时出错：\n"
"%s"
-#: ../tools/browser/common/ui-formgrid.c:781
-#: ../tools/browser/common/ui-formgrid.c:785
+#: ../tools/browser/common/ui-formgrid.c:782
+#: ../tools/browser/common/ui-formgrid.c:786
msgid "Action successfully executed"
msgstr "操作成功执行"
-#: ../tools/browser/common/ui-formgrid.c:802
+#: ../tools/browser/common/ui-formgrid.c:803
#, c-format
msgid ""
"Set or confirm the parameters to execute\n"
@@ -8141,13 +8386,13 @@ msgstr ""
"设置或确认要执行的参数\n"
"操作“%s”"
-#: ../tools/browser/common/ui-formgrid.c:806
+#: ../tools/browser/common/ui-formgrid.c:807
msgid "Execution of action"
msgstr "执行操作"
-#: ../tools/browser/common/ui-formgrid.c:833
-#: ../tools/browser/query-exec/query-console-page.c:1160
-#: ../tools/browser/schema-browser/table-info.c:548
+#: ../tools/browser/common/ui-formgrid.c:834
+#: ../tools/browser/query-exec/query-console-page.c:1163
+#: ../tools/browser/schema-browser/table-info.c:549
#, c-format
msgid "Error executing query: %s"
msgstr "执行查询时出错：%s"
@@ -8175,46 +8420,46 @@ msgstr ""
"您将要定义的虚拟连接可以绑定现有连接中的表以及绑定数据集使之表现为一张表(如导"
"入的 CSV 数据)。您可以按需添加任意多的绑定"
-#: ../tools/browser/connection-binding-properties.c:281
+#: ../tools/browser/connection-binding-properties.c:280
msgid "Add binding"
msgstr "添加绑定"
-#: ../tools/browser/connection-binding-properties.c:331
+#: ../tools/browser/connection-binding-properties.c:330
msgid "Bind a connection"
msgstr "绑定连接"
-#: ../tools/browser/connection-binding-properties.c:337
+#: ../tools/browser/connection-binding-properties.c:336
msgid "Bind a data set"
msgstr "绑定数据集"
-#: ../tools/browser/connection-binding-properties.c:420
+#: ../tools/browser/connection-binding-properties.c:419
msgid "Bind a data set as a table:"
msgstr "将数据集绑定为一张表："
-#: ../tools/browser/connection-binding-properties.c:424
+#: ../tools/browser/connection-binding-properties.c:423
msgid "Import a data set and make it appear as a table"
msgstr "导入数据集并以表形式展现它"
-#: ../tools/browser/connection-binding-properties.c:427
-#: ../tools/browser/connection-binding-properties.c:537
+#: ../tools/browser/connection-binding-properties.c:426
+#: ../tools/browser/connection-binding-properties.c:536
msgid "Remove this bind"
msgstr "移除此绑定"
-#: ../tools/browser/connection-binding-properties.c:477
+#: ../tools/browser/connection-binding-properties.c:476
msgid "Invalid schema name"
msgstr "无效的方案名"
-#: ../tools/browser/connection-binding-properties.c:527
+#: ../tools/browser/connection-binding-properties.c:526
msgid "Bind all tables of a connection using a schema prefix:"
msgstr "使用一个方案前缀绑定一个连接的所有表"
-#: ../tools/browser/connection-binding-properties.c:531
+#: ../tools/browser/connection-binding-properties.c:530
msgid ""
"Each table in the selected connection will appear as a table in the virtual "
"connection using the specified schema as a prefix"
msgstr "所选连接中的每张表将显示为虚拟连接中的一张表，使用指定方案作为前缀"
-#: ../tools/browser/connection-binding-properties.c:564
+#: ../tools/browser/connection-binding-properties.c:563
msgid ""
"Name of the schema the\n"
"tables will be in"
@@ -8238,22 +8483,22 @@ msgid "Data Manager"
msgstr "数据管理器"
#: ../tools/browser/data-manager/data-console.c:301
-#: ../tools/browser/data-manager/data-console.c:520
+#: ../tools/browser/data-manager/data-console.c:517
#: ../tools/browser/schema-browser/relations-diagram.c:329
-#: ../tools/browser/schema-browser/relations-diagram.c:477
+#: ../tools/browser/schema-browser/relations-diagram.c:473
msgid "Unsaved"
msgstr "未保存的"
-#: ../tools/browser/data-manager/data-console.c:332
-#: ../tools/browser/query-exec/query-console-page.c:337
+#: ../tools/browser/data-manager/data-console.c:328
+#: ../tools/browser/query-exec/query-console-page.c:338
msgid "Variables' values:"
msgstr "变量值"
-#: ../tools/browser/data-manager/data-console.c:389
+#: ../tools/browser/data-manager/data-console.c:386
msgid "Reset"
msgstr "重设"
-#: ../tools/browser/data-manager/data-console.c:390
+#: ../tools/browser/data-manager/data-console.c:387
msgid ""
"Reset the editor's\n"
"contents"
@@ -8261,26 +8506,26 @@ msgstr ""
"重设编辑器的\n"
"内容"
-#: ../tools/browser/data-manager/data-console.c:397
+#: ../tools/browser/data-manager/data-console.c:394
msgid "Add a new data source"
msgstr "添加一个新数据源"
-#: ../tools/browser/data-manager/data-console.c:403
-#: ../tools/browser/query-exec/query-console-page.c:370
+#: ../tools/browser/data-manager/data-console.c:400
+#: ../tools/browser/query-exec/query-console-page.c:372
msgid "Variables"
msgstr "变量"
-#: ../tools/browser/data-manager/data-console.c:403
+#: ../tools/browser/data-manager/data-console.c:400
msgid "Show variables needed"
msgstr "显示需要的变量"
-#: ../tools/browser/data-manager/data-console.c:409
-#: ../tools/browser/ldap-browser/ldap-search-page.c:328
-#: ../tools/browser/query-exec/query-console-page.c:377
+#: ../tools/browser/data-manager/data-console.c:406
+#: ../tools/browser/ldap-browser/ldap-search-page.c:329
+#: ../tools/browser/query-exec/query-console-page.c:379
msgid "Execute"
msgstr "执行"
-#: ../tools/browser/data-manager/data-console.c:409
+#: ../tools/browser/data-manager/data-console.c:406
msgid ""
"Execute specified\n"
"data manager"
@@ -8288,11 +8533,11 @@ msgstr ""
"执行指定的\n"
"数据管理器"
-#: ../tools/browser/data-manager/data-console.c:415
+#: ../tools/browser/data-manager/data-console.c:412
msgid "View XML"
msgstr "查看 XML"
-#: ../tools/browser/data-manager/data-console.c:415
+#: ../tools/browser/data-manager/data-console.c:412
msgid ""
"View specifications\n"
"as XML (advanced)"
@@ -8300,70 +8545,70 @@ msgstr ""
"以 XML 查看\n"
"规范(高级)"
-#: ../tools/browser/data-manager/data-console.c:436
+#: ../tools/browser/data-manager/data-console.c:433
msgid "BBB:"
msgstr "BBB："
-#: ../tools/browser/data-manager/data-console.c:508
+#: ../tools/browser/data-manager/data-console.c:505
#, c-format
msgid "'%s' data manager"
msgstr "%s 的数据管理器"
-#: ../tools/browser/data-manager/data-console.c:509
-#: ../tools/browser/data-manager/data-console.c:520
-#: ../tools/browser/data-manager/data-console.c:553
-#: ../tools/browser/data-manager/data-console.c:968
+#: ../tools/browser/data-manager/data-console.c:506
+#: ../tools/browser/data-manager/data-console.c:517
+#: ../tools/browser/data-manager/data-console.c:550
+#: ../tools/browser/data-manager/data-console.c:966
#: ../tools/browser/data-manager/perspective-main.c:33
-#: ../tools/browser/schema-browser/relations-diagram.c:512
-#: ../tools/browser/schema-browser/table-info.c:485
+#: ../tools/browser/schema-browser/relations-diagram.c:508
+#: ../tools/browser/schema-browser/table-info.c:486
msgid "Data manager"
msgstr "数据管理器"
-#: ../tools/browser/data-manager/data-console.c:563
+#: ../tools/browser/data-manager/data-console.c:560
msgid "Could not save data manager"
msgstr "无法保存数据管理器"
-#: ../tools/browser/data-manager/data-console.c:589
+#: ../tools/browser/data-manager/data-console.c:586
msgid "Data manager's name"
msgstr "数据管理器名称"
-#: ../tools/browser/data-manager/data-console.c:609
+#: ../tools/browser/data-manager/data-console.c:606
#: ../tools/browser/ldap-browser/entry-properties.c:275
#: ../tools/browser/schema-browser/relations-diagram.c:288
msgid "Save"
msgstr "保存"
-#: ../tools/browser/data-manager/data-console.c:728
+#: ../tools/browser/data-manager/data-console.c:725
#, c-format
msgid "source%d"
msgstr "源 %d"
-#: ../tools/browser/data-manager/data-console.c:787
+#: ../tools/browser/data-manager/data-console.c:784
msgid "Data source from SQL"
msgstr "来自 SQL 的数据源"
#. To translators: "In schema" refers to the database schema an object is in
-#: ../tools/browser/data-manager/data-console.c:825
-#: ../tools/browser/schema-browser/table-info.c:332
+#: ../tools/browser/data-manager/data-console.c:822
+#: ../tools/browser/schema-browser/table-info.c:333
#, c-format
msgid "In schema '%s'"
msgstr "在方案“%s”中"
-#: ../tools/browser/data-manager/data-console.c:835
+#: ../tools/browser/data-manager/data-console.c:832
#, c-format
msgid "For table: %s"
msgstr "对于表：%s"
-#: ../tools/browser/data-manager/data-console.c:919
+#: ../tools/browser/data-manager/data-console.c:917
msgid ""
"Switching to execution mode. Hit the Escape key to return to the compose mode"
msgstr "切换为执行模式。按 Escape 键返回编写模式"
-#: ../tools/browser/data-manager/data-console.c:925
+#: ../tools/browser/data-manager/data-console.c:923
msgid "_Toggle mode"
msgstr "切换模式(T)"
-#: ../tools/browser/data-manager/data-console.c:925
+#: ../tools/browser/data-manager/data-console.c:923
msgid "Switch between compose and execute modes"
msgstr "在编写和执行模式之间切换"
@@ -8377,16 +8622,16 @@ msgstr "无法删除收藏：%s"
#: ../tools/browser/data-manager/data-favorite-selector.c:258
#: ../tools/browser/data-manager/data-favorite-selector.c:618
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:477
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:483
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:431
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:437
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:252
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:599
-#: ../tools/browser/query-exec/query-console-page.c:816
-#: ../tools/browser/query-exec/query-console-page.c:846
+#: ../tools/browser/query-exec/query-console-page.c:818
+#: ../tools/browser/query-exec/query-console-page.c:848
#: ../tools/browser/query-exec/query-favorite-selector.c:265
#: ../tools/browser/query-exec/query-favorite-selector.c:706
#: ../tools/browser/schema-browser/favorite-selector.c:351
-#: ../tools/browser/schema-browser/table-info.c:468
+#: ../tools/browser/schema-browser/table-info.c:469
#, c-format
msgid "Could not add favorite: %s"
msgstr "无法添加到收藏：%s"
@@ -8411,15 +8656,17 @@ msgstr "未命名的数据管理器"
#: ../tools/browser/data-manager/data-manager-perspective.c:332
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:332
-#: ../tools/browser/query-exec/query-exec-perspective.c:313
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:308
-msgid "_Show favorites"
+#: ../tools/browser/query-exec/query-exec-perspective.c:314
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:309
+#, fuzzy
+#| msgid "_Show favorites"
+msgid "_Show Favorites"
msgstr "显示收藏(_S)"
#: ../tools/browser/data-manager/data-manager-perspective.c:332
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:332
-#: ../tools/browser/query-exec/query-exec-perspective.c:313
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:308
+#: ../tools/browser/query-exec/query-exec-perspective.c:314
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:309
msgid "Show or hide favorites"
msgstr "显示或隐藏收藏"
@@ -8432,7 +8679,9 @@ msgid "Manager"
msgstr "管理器"
#: ../tools/browser/data-manager/data-manager-perspective.c:337
-msgid "_New data manager"
+#, fuzzy
+#| msgid "_New data manager"
+msgid "_New Data Manager"
msgstr "新管理器(_N)"
#: ../tools/browser/data-manager/data-manager-perspective.c:337
@@ -8582,7 +8831,7 @@ msgid "Can't bind parameter '%s' of type '%s' to a parameter of type '%s'"
msgstr "无法将类型为“%2$s”的参数“%1$s”转换为类型为“%3$s”的参数"
#: ../tools/browser/data-manager/ui-spec-editor.c:164
-#: ../tools/browser/schema-browser/table-columns.c:304
+#: ../tools/browser/schema-browser/table-columns.c:305
msgid "Remove"
msgstr "删除"
@@ -8594,17 +8843,17 @@ msgstr "数据源："
msgid "Selected data source's properties:"
msgstr "所选数据源的属性："
-#: ../tools/browser/data-manager/xml-spec-editor.c:173
+#: ../tools/browser/data-manager/xml-spec-editor.c:174
msgid "Error parsing XML specifications"
msgstr "解析 XML 规范出错"
-#: ../tools/browser/data-manager/xml-spec-editor.c:187
+#: ../tools/browser/data-manager/xml-spec-editor.c:188
#, c-format
msgid "Expecting <%s> root node"
msgstr "应为 <%s> 根节点"
-#: ../tools/browser/data-manager/xml-spec-editor.c:317
-#: ../tools/browser/query-exec/query-console-page.c:317
+#: ../tools/browser/data-manager/xml-spec-editor.c:318
+#: ../tools/browser/query-exec/query-console-page.c:318
msgid "SQL code to execute:"
msgstr "要执行的 SQL 代码："
@@ -8612,43 +8861,43 @@ msgstr "要执行的 SQL 代码："
msgid "Browse your database's contents"
msgstr "浏览您的数据库内容"
-#: ../tools/browser/ldap-browser/class-properties.c:405
+#: ../tools/browser/ldap-browser/class-properties.c:407
msgid "Could not get information about LDAP class"
msgstr "无法获取有关 LDAP 类的信息"
-#: ../tools/browser/ldap-browser/class-properties.c:425
+#: ../tools/browser/ldap-browser/class-properties.c:427
msgid "Class OID:"
msgstr "类 OID："
-#: ../tools/browser/ldap-browser/class-properties.c:436
+#: ../tools/browser/ldap-browser/class-properties.c:438
msgid "Class kind:"
msgstr "类类型："
-#: ../tools/browser/ldap-browser/class-properties.c:450
+#: ../tools/browser/ldap-browser/class-properties.c:452
msgid "Class name:"
msgid_plural "Class names:"
msgstr[0] "类名："
-#: ../tools/browser/ldap-browser/class-properties.c:463
+#: ../tools/browser/ldap-browser/class-properties.c:465
msgid "This LDAP class is obsolete"
msgstr "此 LDAP 类已废弃"
-#: ../tools/browser/ldap-browser/class-properties.c:471
+#: ../tools/browser/ldap-browser/class-properties.c:473
msgid "Required attribute:"
msgid_plural "Required attributes:"
msgstr[0] "必需的属性："
-#: ../tools/browser/ldap-browser/class-properties.c:487
+#: ../tools/browser/ldap-browser/class-properties.c:489
msgid "Optional attribute:"
msgid_plural "Optional attributes:"
msgstr[0] "可选的属性："
-#: ../tools/browser/ldap-browser/class-properties.c:506
+#: ../tools/browser/ldap-browser/class-properties.c:508
msgid "Children class:"
msgid_plural "Children classes:"
msgstr[0] "子类："
-#: ../tools/browser/ldap-browser/class-properties.c:551
+#: ../tools/browser/ldap-browser/class-properties.c:553
msgid "Inherited class:"
msgid_plural "Inherited classes:"
msgstr[0] "继承类："
@@ -8662,28 +8911,28 @@ msgstr "选择用于保存数据的文件"
msgid "Could not save data: %s"
msgstr "无法保存数据：%s"
-#: ../tools/browser/ldap-browser/entry-properties.c:531
+#: ../tools/browser/ldap-browser/entry-properties.c:532
#, fuzzy
#| msgid "No title"
msgid "Non activated"
msgstr "无一激活"
-#: ../tools/browser/ldap-browser/entry-properties.c:579
-#: ../tools/browser/ldap-browser/entry-properties.c:583
+#: ../tools/browser/ldap-browser/entry-properties.c:580
+#: ../tools/browser/ldap-browser/entry-properties.c:584
msgid "Never"
msgstr "从不"
#. DN
-#: ../tools/browser/ldap-browser/entry-properties.c:763
+#: ../tools/browser/ldap-browser/entry-properties.c:764
msgid "Distinguished Name:"
msgstr "可分别名称(DN)："
-#: ../tools/browser/ldap-browser/entry-properties.c:910
+#: ../tools/browser/ldap-browser/entry-properties.c:911
msgid "Can't display attribute value"
msgstr "无法显示属性值"
-#: ../tools/browser/ldap-browser/entry-properties.c:925
-#: ../tools/browser/ldap-browser/entry-properties.c:960
+#: ../tools/browser/ldap-browser/entry-properties.c:926
+#: ../tools/browser/ldap-browser/entry-properties.c:961
msgid "Could not get information about LDAP entry"
msgstr "无法获取有关 LDAP 记录的信息"
@@ -8703,30 +8952,32 @@ msgstr "要获取的属性："
msgid "Search scope:"
msgstr "搜索范围："
-#: ../tools/browser/ldap-browser/hierarchy-view.c:568
+#: ../tools/browser/ldap-browser/hierarchy-view.c:522
#, fuzzy, c-format
#| msgid "Could not find LDAP entry whith DN '%s'"
msgid "Could not find LDAP entry with DN '%s'"
msgstr "找不到 DN 为“%s”的 LDAP 记录"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:336
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:553
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:559
-#: ../tools/browser/ldap-browser/ldap-search-page.c:464
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:507
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:513
+#: ../tools/browser/ldap-browser/ldap-search-page.c:465
msgid "_LDAP"
msgstr "_LDAP"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:336
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:553
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:559
-#: ../tools/browser/ldap-browser/ldap-search-page.c:464
-#: ../tools/gda-sql.c:2969 ../tools/gda-sql.c:2982 ../tools/gda-sql.c:2999
-#: ../tools/gda-sql.c:3012
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:507
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:513
+#: ../tools/browser/ldap-browser/ldap-search-page.c:465
+#: ../tools/gda-sql.c:2415 ../tools/gda-sql.c:2423 ../tools/gda-sql.c:2435
+#: ../tools/gda-sql.c:2443
msgid "LDAP"
msgstr "LDAP"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:337
-msgid "_New LDAP entries browser"
+#, fuzzy
+#| msgid "_New LDAP entries browser"
+msgid "_New LDAP Entries Browser"
msgstr "新 LDAP 记录浏览器(_N)"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:337
@@ -8734,7 +8985,9 @@ msgid "Open a new LDAP entries browser"
msgstr "打开一个新 LDAP 记录浏览器"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:339
-msgid "_New LDAP classes browser"
+#, fuzzy
+#| msgid "_New LDAP classes browser"
+msgid "_New LDAP Classes Browser"
msgstr "新 LDAP 类浏览器(_N)"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:339
@@ -8742,85 +8995,95 @@ msgid "Open a new LDAP classes browser"
msgstr "打开一个新 LDAP 类浏览器"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:341
-msgid "_New LDAP search"
+#, fuzzy
+#| msgid "_New LDAP search"
+msgid "_New LDAP Search"
msgstr "新 LDAP 搜索(_N)"
#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:341
msgid "Open a new LDAP search form"
msgstr "打开一个新的 LDAP 搜索表单"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:363
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:317
msgid "LDAP classes browser"
msgstr "LDAP 类浏览器"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:383
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:619
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:337
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:573
msgid "LDAP classes"
msgstr "LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:410
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:364
msgid "LDAP class's properties"
msgstr "LDAP 类的属性"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:554
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:560
-#: ../tools/browser/schema-browser/table-info.c:989
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:508
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:514
+#: ../tools/browser/schema-browser/table-info.c:990
msgid "Add to _Favorites"
msgstr "添加到收藏(_F)"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:554
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:508
msgid "Add class to favorites"
msgstr "添加类到收藏"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:556
-msgid "Previous class"
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:510
+#, fuzzy
+#| msgid "Previous class"
+msgid "Previous Class"
msgstr "上个类"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:556
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:510
msgid "Move back to previous LDAP class"
msgstr "后退到上个 LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:558
-msgid "Next class"
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:512
+#, fuzzy
+#| msgid "Next class"
+msgid "Next Class"
msgstr "下个类"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:558
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:512
msgid "Move to next LDAP class"
msgstr "前进到下个 LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:369
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:323
msgid "LDAP entries browser"
msgstr "LDAP 记录浏览器"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:389
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:343
msgid "LDAP hierarchy"
msgstr "LDAP 层次结构"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:416
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:370
msgid "LDAP entry's details"
msgstr "LDAP 记录详情"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:560
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:514
msgid "Add entry to favorites"
msgstr "添加记录到收藏"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:562
-msgid "Previous entry"
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:516
+#, fuzzy
+#| msgid "Previous entry"
+msgid "Previous Entry"
msgstr "上个记录"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:562
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:516
msgid "Move back to previous LDAP entry"
msgstr "后退到上个 LDAP 记录"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:564
-msgid "Next entry"
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:518
+#, fuzzy
+#| msgid "Next entry"
+msgid "Next Entry"
msgstr "下个记录"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:564
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:518
msgid "Move to next LDAP entry"
msgstr "前进到下个 LDAP 记录"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:625
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:579
msgid "LDAP entries"
msgstr "LDAP 记录"
@@ -8830,52 +9093,54 @@ msgstr "LDAP 记录"
msgid "Favorites"
msgstr "收藏"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:287
+#: ../tools/browser/ldap-browser/ldap-search-page.c:288
msgid "LDAP search page"
msgstr "LDAP 搜索页面"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:297
+#: ../tools/browser/ldap-browser/ldap-search-page.c:298
msgid "LDAP search settings"
msgstr "LDAP 搜索设置"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:322
-#: ../tools/browser/query-exec/query-console-page.c:364
-#: ../tools/browser/query-exec/query-console-page.c:433
+#: ../tools/browser/ldap-browser/ldap-search-page.c:323
+#: ../tools/browser/query-exec/query-console-page.c:366
+#: ../tools/browser/query-exec/query-console-page.c:435
msgid "Clear"
msgstr "清理"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:323
+#: ../tools/browser/ldap-browser/ldap-search-page.c:324
msgid "Clear the search settings"
msgstr "清除搜索设置"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:329
+#: ../tools/browser/ldap-browser/ldap-search-page.c:330
msgid "Execute LDAP search"
msgstr "执行 LDAP 搜索"
#. results
-#: ../tools/browser/ldap-browser/ldap-search-page.c:335
+#: ../tools/browser/ldap-browser/ldap-search-page.c:336
msgid "Results"
msgstr "结果"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:383
+#: ../tools/browser/ldap-browser/ldap-search-page.c:384
#, c-format
msgid "Could not define virtual table for this LDAP search: %s"
msgstr "无法为此 LDAP 搜索定义虚拟表：%s"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:389
+#: ../tools/browser/ldap-browser/ldap-search-page.c:390
#, c-format
msgid "Virtual table '%s' for this LDAP search has been defined"
msgstr "此 LDAP 搜索的虚拟表“%s”已经定义"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:465
-msgid "Define as table"
+#: ../tools/browser/ldap-browser/ldap-search-page.c:466
+#, fuzzy
+#| msgid "Define as table"
+msgid "Define as Table"
msgstr "定义为表"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:465
+#: ../tools/browser/ldap-browser/ldap-search-page.c:466
msgid "Define search as a virtual table"
msgstr "将搜索定义为虚拟表"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:539
+#: ../tools/browser/ldap-browser/ldap-search-page.c:540
msgid "LDAP search"
msgstr "LDAP 搜索"
@@ -8918,7 +9183,7 @@ msgstr ""
msgid "Cancelled by the user"
msgstr "被用户取消"
-#: ../tools/browser/main.c:105 ../tools/gda-sql.c:185
+#: ../tools/browser/main.c:105 ../tools/gda-sql.c:186
msgid "[DSN|connection string]..."
msgstr "[DSN|连接字符串]..."
@@ -8928,19 +9193,19 @@ msgstr "[DSN|连接字符串]..."
msgid "Error: %s\n"
msgstr "错误：%s\n"
-#: ../tools/browser/main.c:162 ../tools/gda-sql.c:295
+#: ../tools/browser/main.c:162 ../tools/gda-sql.c:299
#, c-format
msgid "All files are in the directory: %s\n"
msgstr "所有文件都在目录中：%s\n"
-#: ../tools/browser/main.c:170 ../tools/gda-sql.c:303
+#: ../tools/browser/main.c:170 ../tools/gda-sql.c:307
#, c-format
msgid ""
"Can't get the list of files used to store information about each connection: "
"%s\n"
msgstr "无法获取用来保存各连接相关信息的文件的列表：%s\n"
-#: ../tools/browser/main.c:185 ../tools/gda-sql.c:315
+#: ../tools/browser/main.c:185 ../tools/gda-sql.c:319
#, fuzzy, c-format
#| msgid "Error while fetching meta data from the connection: %s"
msgid ""
@@ -8948,59 +9213,59 @@ msgid ""
"%s\n"
msgstr "在冲洗用于保存各个连接信息的文件时出错：%s\n"
-#: ../tools/browser/mgr-favorites.c:250
+#: ../tools/browser/mgr-favorites.c:251
msgid "Multiple statements"
msgstr "多个语句"
-#: ../tools/browser/mgr-favorites.c:254
+#: ../tools/browser/mgr-favorites.c:255
msgid "SELECT statement"
msgstr "SELECT 语句"
-#: ../tools/browser/mgr-favorites.c:257
+#: ../tools/browser/mgr-favorites.c:258
msgid "INSERT statement"
msgstr "INSERT 语句"
-#: ../tools/browser/mgr-favorites.c:260
+#: ../tools/browser/mgr-favorites.c:261
msgid "UPDATE statement"
msgstr "UPDATE 语句"
-#: ../tools/browser/mgr-favorites.c:263
+#: ../tools/browser/mgr-favorites.c:264
msgid "DELETE statement"
msgstr "DELETE 语句"
-#: ../tools/browser/mgr-favorites.c:266
+#: ../tools/browser/mgr-favorites.c:267
msgid "COMPOUND SELECT statement"
msgstr "COMPOUND SELECT 语句"
-#: ../tools/browser/mgr-favorites.c:269
+#: ../tools/browser/mgr-favorites.c:270
msgid "BEGIN statement"
msgstr "BEGIN 语句"
-#: ../tools/browser/mgr-favorites.c:272
+#: ../tools/browser/mgr-favorites.c:273
msgid "ROLLBACK statement"
msgstr "ROLLBACK 语句"
-#: ../tools/browser/mgr-favorites.c:275
+#: ../tools/browser/mgr-favorites.c:276
msgid "COMMIT statement"
msgstr "COMMIT 语句"
-#: ../tools/browser/mgr-favorites.c:278
+#: ../tools/browser/mgr-favorites.c:279
msgid "ADD SAVEPOINT statement"
msgstr "ADD SAVEPOINT 语句"
-#: ../tools/browser/mgr-favorites.c:281
+#: ../tools/browser/mgr-favorites.c:282
msgid "ROLLBACK SAVEPOINT statement"
msgstr "ROLLBACK SAVEPOINT 语句"
-#: ../tools/browser/mgr-favorites.c:284
+#: ../tools/browser/mgr-favorites.c:285
msgid "DELETE SAVEPOINT statement"
msgstr "DELETE SAVEPOINT 语句"
-#: ../tools/browser/mgr-favorites.c:287
+#: ../tools/browser/mgr-favorites.c:288
msgid "Unknown statement"
msgstr "未知语句"
-#: ../tools/browser/mgr-favorites.c:757
+#: ../tools/browser/mgr-favorites.c:758
msgid ""
"Getting\n"
"favorites..."
@@ -9008,7 +9273,7 @@ msgstr ""
"正在获取\n"
"收藏..."
-#: ../tools/browser/mgr-favorites.c:769
+#: ../tools/browser/mgr-favorites.c:770
msgid ""
"No favorite:\n"
"drag item to\n"
@@ -9022,12 +9287,12 @@ msgstr ""
msgid "Query execution (SQL)"
msgstr "查询执行 (SQL)"
-#: ../tools/browser/query-exec/query-console-page.c:291
-#: ../tools/browser/query-exec/query-console-page.c:1268
+#: ../tools/browser/query-exec/query-console-page.c:292
+#: ../tools/browser/query-exec/query-console-page.c:1271
msgid "Query editor"
msgstr "查询编辑器"
-#: ../tools/browser/query-exec/query-console-page.c:365
+#: ../tools/browser/query-exec/query-console-page.c:367
msgid ""
"Clear the editor's\n"
"contents"
@@ -9035,7 +9300,7 @@ msgstr ""
"清理编辑器\n"
"内容"
-#: ../tools/browser/query-exec/query-console-page.c:371
+#: ../tools/browser/query-exec/query-console-page.c:373
msgid ""
"Show variables needed\n"
"to execute SQL"
@@ -9043,15 +9308,15 @@ msgstr ""
"显示执行 SQL 所\n"
"需要的变量"
-#: ../tools/browser/query-exec/query-console-page.c:377
+#: ../tools/browser/query-exec/query-console-page.c:379
msgid "Execute SQL in editor"
msgstr "在编辑器中执行 SQL"
-#: ../tools/browser/query-exec/query-console-page.c:383
+#: ../tools/browser/query-exec/query-console-page.c:385
msgid "Indent"
msgstr "缩进"
-#: ../tools/browser/query-exec/query-console-page.c:384
+#: ../tools/browser/query-exec/query-console-page.c:386
msgid ""
"Indent SQL in editor\n"
"and make the code more readable\n"
@@ -9060,23 +9325,23 @@ msgstr ""
"在编辑器中缩进 SQL\n"
"以使代码更易读(删除注释)"
-#: ../tools/browser/query-exec/query-console-page.c:392
+#: ../tools/browser/query-exec/query-console-page.c:394
msgid "Favorite"
msgstr "收藏"
-#: ../tools/browser/query-exec/query-console-page.c:393
+#: ../tools/browser/query-exec/query-console-page.c:395
msgid "Add SQL to favorite"
msgstr "向收藏中添加 SQL"
-#: ../tools/browser/query-exec/query-console-page.c:407
+#: ../tools/browser/query-exec/query-console-page.c:409
msgid "Execution history:"
msgstr "执行历史："
-#: ../tools/browser/query-exec/query-console-page.c:425
+#: ../tools/browser/query-exec/query-console-page.c:427
msgid "Copy"
msgstr "复制"
-#: ../tools/browser/query-exec/query-console-page.c:426
+#: ../tools/browser/query-exec/query-console-page.c:428
msgid ""
"Copy selected history\n"
"to editor"
@@ -9084,56 +9349,56 @@ msgstr ""
"复制选中的历史\n"
"到编辑器"
-#: ../tools/browser/query-exec/query-console-page.c:434
+#: ../tools/browser/query-exec/query-console-page.c:436
msgid "Clear history"
msgstr "清理历史"
-#: ../tools/browser/query-exec/query-console-page.c:446
+#: ../tools/browser/query-exec/query-console-page.c:448
msgid "Execution Results:"
msgstr "执行结果："
-#: ../tools/browser/query-exec/query-console-page.c:708
+#: ../tools/browser/query-exec/query-console-page.c:710
msgid "New favorite"
msgstr "新建收藏"
-#: ../tools/browser/query-exec/query-console-page.c:719
-#: ../tools/browser/query-exec/query-console-page.c:752
+#: ../tools/browser/query-exec/query-console-page.c:721
+#: ../tools/browser/query-exec/query-console-page.c:754
#, c-format
msgid "Modify favorite '%s'"
msgstr "修改收藏“%s”"
-#: ../tools/browser/query-exec/query-console-page.c:740
+#: ../tools/browser/query-exec/query-console-page.c:742
msgid "Modify a favorite"
msgstr "修改收藏"
-#: ../tools/browser/query-exec/query-console-page.c:789
-#: ../tools/browser/query-exec/query-console-page.c:809
+#: ../tools/browser/query-exec/query-console-page.c:791
+#: ../tools/browser/query-exec/query-console-page.c:811
msgid "Favorite's name"
msgstr "收藏的名称"
-#: ../tools/browser/query-exec/query-console-page.c:790
+#: ../tools/browser/query-exec/query-console-page.c:792
#: ../tools/browser/query-exec/query-favorite-selector.c:696
msgid "Unnamed query"
msgstr "未命名查询"
-#: ../tools/browser/query-exec/query-console-page.c:793
+#: ../tools/browser/query-exec/query-console-page.c:795
msgid "Name of the favorite to create"
msgstr "要创建的收藏的名称"
-#: ../tools/browser/query-exec/query-console-page.c:794
+#: ../tools/browser/query-exec/query-console-page.c:796
msgid "Enter the name of the favorite to create"
msgstr "输入要创建的收藏的名称"
-#: ../tools/browser/query-exec/query-console-page.c:924
+#: ../tools/browser/query-exec/query-console-page.c:927
msgid "Invalid variable's contents"
msgstr "无效的变量内容"
-#: ../tools/browser/query-exec/query-console-page.c:925
-#: ../tools/browser/schema-browser/table-info.c:923
+#: ../tools/browser/query-exec/query-console-page.c:928
+#: ../tools/browser/schema-browser/table-info.c:924
msgid "assign values to the following variables"
msgstr "为如下变量假设值"
-#: ../tools/browser/query-exec/query-console-page.c:1032
+#: ../tools/browser/query-exec/query-console-page.c:1035
msgid ""
"A transaction has automatically been started\n"
"during this statement's execution, this usually\n"
@@ -9143,86 +9408,88 @@ msgid ""
"closing the transaction)."
msgstr ""
-#: ../tools/browser/query-exec/query-console-page.c:1050
+#: ../tools/browser/query-exec/query-console-page.c:1053
msgid "Statement executed"
msgstr "语句已经执行"
-#: ../tools/browser/query-exec/query-console-page.c:1107
+#: ../tools/browser/query-exec/query-console-page.c:1110
#, c-format
msgid "Error while parsing code: %s"
msgstr "解析代码时出错：%s"
-#: ../tools/browser/query-exec/query-console-page.c:1117
+#: ../tools/browser/query-exec/query-console-page.c:1120
msgid ""
"A query is already being executed, to execute another query, open a new "
"connection."
msgstr "查询已经执行，要执行另一个查询，请打开一个新连接。"
-#: ../tools/browser/query-exec/query-console-page.c:1176
+#: ../tools/browser/query-exec/query-console-page.c:1179
msgid ""
"Internal error, please report error to http://bugzilla.gnome.org/ for the "
"\"libgda\" product"
msgstr "内部错误，请向 http://bugzilla.gnome.org/ 报告“libgda”产品的错误"
-#: ../tools/browser/query-exec/query-console-page.c:1219
+#: ../tools/browser/query-exec/query-console-page.c:1222
msgid "_Execute"
msgstr "执行(_E)"
-#: ../tools/browser/query-exec/query-console-page.c:1219
+#: ../tools/browser/query-exec/query-console-page.c:1222
msgid "Execute query"
msgstr "执行查询"
-#: ../tools/browser/query-exec/query-console-page.c:1222
+#: ../tools/browser/query-exec/query-console-page.c:1225
msgid "_Undo"
msgstr "撤销(_U)"
-#: ../tools/browser/query-exec/query-console-page.c:1222
+#: ../tools/browser/query-exec/query-console-page.c:1225
msgid "Undo last change"
msgstr "撤销最后的更改"
-#: ../tools/browser/query-exec/query-editor.c:697
+#: ../tools/browser/query-exec/query-editor.c:698
msgid "Copy all in a single line"
msgstr "将所有内容复制成一行"
-#: ../tools/browser/query-exec/query-editor.c:1244
+#: ../tools/browser/query-exec/query-editor.c:1245
msgid "In the future:\n"
msgstr "未来：\n"
-#: ../tools/browser/query-exec/query-editor.c:1248
+#: ../tools/browser/query-exec/query-editor.c:1249
msgid "Less than a minute ago:\n"
msgstr "不到一分钟以前：\n"
-#: ../tools/browser/query-exec/query-editor.c:1253
+#: ../tools/browser/query-exec/query-editor.c:1254
#, c-format
msgid "%lu minute ago:\n"
msgid_plural "%lu minutes ago:\n"
msgstr[0] "%lu 分钟以前：\n"
-#: ../tools/browser/query-exec/query-editor.c:1260
+#: ../tools/browser/query-exec/query-editor.c:1261
#, c-format
msgid "%lu hour ago\n"
msgid_plural "%lu hours ago\n"
msgstr[0] "%lu 小时之前\n"
-#: ../tools/browser/query-exec/query-editor.c:1266
+#: ../tools/browser/query-exec/query-editor.c:1267
#, c-format
msgid "%lu day ago\n"
msgid_plural "%lu days ago\n"
msgstr[0] "%lu 天之前\n"
-#: ../tools/browser/query-exec/query-exec-perspective.c:317
+#: ../tools/browser/query-exec/query-exec-perspective.c:318
msgid "_Query"
msgstr "查询(_Q)"
-#: ../tools/browser/query-exec/query-exec-perspective.c:317
+#: ../tools/browser/query-exec/query-exec-perspective.c:318
msgid "Query"
msgstr "查询"
-#: ../tools/browser/query-exec/query-exec-perspective.c:318
-msgid "_New editor"
+#: ../tools/browser/query-exec/query-exec-perspective.c:319
+#, fuzzy
+#| msgid "_New editor"
+msgid "_New Editor"
msgstr "新编辑器(_N)"
-#: ../tools/browser/query-exec/query-exec-perspective.c:318
+#: ../tools/browser/query-exec/query-exec-perspective.c:319
msgid "Open a new query editor"
msgstr "打开一个新查询编辑器"
@@ -9253,15 +9520,16 @@ msgstr "语句："
#: ../tools/browser/query-exec/query-result.c:240
#: ../tools/browser/query-exec/query-result.c:268
-#: ../tools/browser/query-exec/query-result.c:454 ../tools/gda-sql.c:697
-#: ../tools/gda-sql.c:779 ../tools/gda-sql.c:2036
+#: ../tools/browser/query-exec/query-result.c:454
+#: ../tools/cmdtool/tool-output.c:89 ../tools/cmdtool/tool-output.c:495
+#: ../tools/cmdtool/tool-output.c:577 ../tools/gda-sql.c:1742
#, c-format
msgid "Execution delay"
msgstr "执行延迟"
#: ../tools/browser/query-exec/query-result.c:260
-#: ../tools/browser/query-exec/query-result.c:447 ../tools/gda-sql.c:690
-#: ../tools/gda-sql.c:772
+#: ../tools/browser/query-exec/query-result.c:447
+#: ../tools/cmdtool/tool-output.c:488 ../tools/cmdtool/tool-output.c:570
msgid "Number of rows impacted"
msgstr "影响的行数"
@@ -9293,7 +9561,7 @@ msgstr "请求的对象不是一个表或者视图"
msgid "Auto incremented"
msgstr "自动增加"
-#: ../tools/browser/schema-browser/objects-index.c:171
+#: ../tools/browser/schema-browser/objects-index.c:175
msgid "Tables' index"
msgstr "表索引"
@@ -9302,7 +9570,7 @@ msgid "Schema browser"
msgstr "方案浏览器"
#: ../tools/browser/schema-browser/relations-diagram.c:232
-#: ../tools/browser/schema-browser/relations-diagram.c:570
+#: ../tools/browser/schema-browser/relations-diagram.c:566
msgid "Diagram"
msgstr "图示"
@@ -9315,114 +9583,114 @@ msgid "Canvas's name"
msgstr "画布名"
#: ../tools/browser/schema-browser/relations-diagram.c:329
-#: ../tools/browser/schema-browser/relations-diagram.c:386
-#: ../tools/browser/schema-browser/relations-diagram.c:466
-#: ../tools/browser/schema-browser/relations-diagram.c:477
+#: ../tools/browser/schema-browser/relations-diagram.c:382
+#: ../tools/browser/schema-browser/relations-diagram.c:462
+#: ../tools/browser/schema-browser/relations-diagram.c:473
msgid "Relations diagram"
msgstr "关系图示"
-#: ../tools/browser/schema-browser/relations-diagram.c:376
+#: ../tools/browser/schema-browser/relations-diagram.c:372
msgid "Error parsing favorite's contents"
msgstr "解析收藏内容出错"
-#: ../tools/browser/schema-browser/relations-diagram.c:385
-#: ../tools/browser/schema-browser/relations-diagram.c:465
+#: ../tools/browser/schema-browser/relations-diagram.c:381
+#: ../tools/browser/schema-browser/relations-diagram.c:461
#, c-format
msgid "'%s' diagram"
msgstr "“%s”图示"
-#: ../tools/browser/schema-browser/relations-diagram.c:435
+#: ../tools/browser/schema-browser/relations-diagram.c:431
msgid "Missing table attribute in favorite's contents"
msgstr "在收藏内容中丢失表属性"
-#: ../tools/browser/schema-browser/relations-diagram.c:521
-#: ../tools/browser/schema-browser/table-info.c:991
+#: ../tools/browser/schema-browser/relations-diagram.c:517
+#: ../tools/browser/schema-browser/table-info.c:992
msgid "_Contents"
msgstr "内容(_C)"
-#: ../tools/browser/schema-browser/relations-diagram.c:521
+#: ../tools/browser/schema-browser/relations-diagram.c:517
msgid "View contents"
msgstr "查看内容"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:313
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:314
msgid "_Schema"
msgstr "方案(_S)"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:313
-#: ../tools/command-exec.c:1093
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:314
+#: ../tools/command-exec.c:585
msgid "Schema"
msgstr "方案"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:314
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:315
msgid "_New Diagram"
msgstr "新图示(_N)"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:314
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:315
msgid "Create a new diagram"
msgstr "创建一个新图示"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:418
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:419
msgid "Could not load diagram"
msgstr "无法加载图示"
-#: ../tools/browser/schema-browser/table-columns.c:268
+#: ../tools/browser/schema-browser/table-columns.c:269
#, c-format
msgid "Declared foreign key '%s' on "
msgstr ""
-#: ../tools/browser/schema-browser/table-columns.c:271
+#: ../tools/browser/schema-browser/table-columns.c:272
#, c-format
msgid "Foreign key '%s' on "
msgstr ""
-#: ../tools/browser/schema-browser/table-columns.c:337
+#: ../tools/browser/schema-browser/table-columns.c:338
#, c-format
msgid ""
"incompatible types: '%s' for the foreign key and '%s' for the referenced "
"primary key"
msgstr ""
-#: ../tools/browser/schema-browser/table-columns.c:386
+#: ../tools/browser/schema-browser/table-columns.c:387
#, c-format
msgid "Could not compute table's UNIQUE constraints for %s.%s.%s"
msgstr "无法计算表对 %s.%s.%s 的“惟一”约束"
-#: ../tools/browser/schema-browser/table-columns.c:409
+#: ../tools/browser/schema-browser/table-columns.c:410
msgid "Unique constraint"
msgstr "惟一约束"
-#: ../tools/browser/schema-browser/table-columns.c:431
+#: ../tools/browser/schema-browser/table-columns.c:432
msgid "Tables referencing this one"
msgstr "引用此表的表"
-#: ../tools/browser/schema-browser/table-columns.c:629
+#: ../tools/browser/schema-browser/table-columns.c:630
msgid "Column Name"
msgstr "列名"
#. To translators: "Not NULL?" is a table's column's attribute. The NULL term should not be translated as it
refers to the SQL NULL value
-#: ../tools/browser/schema-browser/table-columns.c:651
+#: ../tools/browser/schema-browser/table-columns.c:652
msgid "Not NULL?"
msgstr "非 NULL？"
-#: ../tools/browser/schema-browser/table-columns.c:689
+#: ../tools/browser/schema-browser/table-columns.c:690
msgid "LDAP virtual table definition"
msgstr "LDAP 虚拟表定义"
-#: ../tools/browser/schema-browser/table-columns.c:736
+#: ../tools/browser/schema-browser/table-columns.c:737
msgid "Constraints and integrity rules"
msgstr "约束和完整性规则"
-#: ../tools/browser/schema-browser/table-columns.c:927
+#: ../tools/browser/schema-browser/table-columns.c:930
#, c-format
msgid "Could not find table '%s.%s'"
msgstr "找不到表“%s.%s”"
-#: ../tools/browser/schema-browser/table-columns.c:962
+#: ../tools/browser/schema-browser/table-columns.c:965
#, c-format
msgid "Could not find declared foreign key '%s'"
msgstr "找不到已声明的外键“%s”"
-#: ../tools/browser/schema-browser/table-info.c:357
+#: ../tools/browser/schema-browser/table-info.c:358
msgid ""
"Table not found. If you think this is an error,\n"
"please refresh the meta data from the database\n"
@@ -9431,27 +9699,27 @@ msgstr ""
"没有找到表。如果您认为这是错误，请从数据库\n"
"中刷新元数据 (菜单 Connection/Fetch 元数据)"
-#: ../tools/browser/schema-browser/table-info.c:388
+#: ../tools/browser/schema-browser/table-info.c:389
msgid "Relations"
msgstr "关系"
-#: ../tools/browser/schema-browser/table-info.c:398
+#: ../tools/browser/schema-browser/table-info.c:399
msgid "Preferences"
msgstr "首选项"
-#: ../tools/browser/schema-browser/table-info.c:527
+#: ../tools/browser/schema-browser/table-info.c:528
msgid "Data successfully inserted"
msgstr "数据成功插入"
-#: ../tools/browser/schema-browser/table-info.c:675
+#: ../tools/browser/schema-browser/table-info.c:676
msgid "Meta data not yet available"
msgstr "元数据尚不可用"
-#: ../tools/browser/schema-browser/table-info.c:692
+#: ../tools/browser/schema-browser/table-info.c:693
msgid "Can't find information about table"
msgstr "找不到有关表的信息"
-#: ../tools/browser/schema-browser/table-info.c:728
+#: ../tools/browser/schema-browser/table-info.c:729
#, c-format
msgid ""
"Internal error while building INSERT statement:\n"
@@ -9460,62 +9728,66 @@ msgstr ""
"在生成 INSERT 语句时发生内部错误：\n"
"%s"
-#: ../tools/browser/schema-browser/table-info.c:774
+#: ../tools/browser/schema-browser/table-info.c:775
#, c-format
msgid "Default value: '%s'"
msgstr "默认值：“%s”"
-#: ../tools/browser/schema-browser/table-info.c:784
+#: ../tools/browser/schema-browser/table-info.c:785
msgid "Default value: auto incremented value"
msgstr "默认值：自动增加的值"
-#: ../tools/browser/schema-browser/table-info.c:898
-#: ../tools/browser/schema-browser/table-info.c:922
+#: ../tools/browser/schema-browser/table-info.c:899
+#: ../tools/browser/schema-browser/table-info.c:923
msgid "Values to insert into table"
msgstr "要插入表的值"
-#: ../tools/browser/schema-browser/table-info.c:959
+#: ../tools/browser/schema-browser/table-info.c:960
#, c-format
msgid "Can't find information about table '%s'"
msgstr "找不到有关表“%s”的信息"
-#: ../tools/browser/schema-browser/table-info.c:988
+#: ../tools/browser/schema-browser/table-info.c:989
msgid "_Table"
msgstr "表(_T)"
-#: ../tools/browser/schema-browser/table-info.c:989
+#: ../tools/browser/schema-browser/table-info.c:990
msgid "Add table to favorites"
msgstr "添加表到收藏"
-#: ../tools/browser/schema-browser/table-info.c:991
+#: ../tools/browser/schema-browser/table-info.c:992
msgid "View table's contents"
msgstr "查看表的内容"
-#: ../tools/browser/schema-browser/table-info.c:993
-msgid "_Insert data"
+#: ../tools/browser/schema-browser/table-info.c:994
+#, fuzzy
+#| msgid "_Insert data"
+msgid "_Insert Data"
msgstr "插入数据(_I)"
-#: ../tools/browser/schema-browser/table-info.c:993
+#: ../tools/browser/schema-browser/table-info.c:994
msgid "Insert data into table"
msgstr "向表中插入数据"
-#: ../tools/browser/schema-browser/table-info.c:995
-msgid "_Declare foreign key"
+#: ../tools/browser/schema-browser/table-info.c:996
+#, fuzzy
+#| msgid "_Declare foreign key"
+msgid "_Declare Foreign Key"
msgstr "声明外键(_D)"
-#: ../tools/browser/schema-browser/table-info.c:995
+#: ../tools/browser/schema-browser/table-info.c:996
msgid "Declare a foreign key for table"
msgstr "为表声明一个外键"
-#: ../tools/browser/schema-browser/table-preferences.c:262
+#: ../tools/browser/schema-browser/table-preferences.c:263
msgid "default"
msgstr "默认"
-#: ../tools/browser/schema-browser/table-preferences.c:339
+#: ../tools/browser/schema-browser/table-preferences.c:340
msgid "Table's fields"
msgstr "表的字段"
-#: ../tools/browser/schema-browser/table-preferences.c:383
+#: ../tools/browser/schema-browser/table-preferences.c:384
msgid "Field's display preferences"
msgstr "字段名显示首选项"
@@ -9644,84 +9916,111 @@ msgstr "搜索："
msgid "Case sensitive"
msgstr "区分大小写"
-#: ../tools/command-exec.c:460 ../tools/command-exec.c:653
+#: ../tools/cmdtool/tool-command.c:142 ../tools/cmdtool/tool-command.c:160
+msgid "Invalid unnamed command"
+msgstr "无效的未命名命令"
+
+#: ../tools/cmdtool/tool-command.c:282
+#, fuzzy, c-format
+#| msgid "Command '%s' not found\n"
+msgid "Command '%s' not found"
+msgstr "没有找到命令“%s”\n"
+
+#: ../tools/cmdtool/tool-command.c:313
+#, fuzzy, c-format
+#| msgid "Syntax error at line %d, column %d"
+msgid "Syntax error after '\\'"
+msgstr "%d 行，%d 列中语法错误"
+
+#: ../tools/cmdtool/tool-command.c:343
+#, c-format
+msgid "Unbalanced usage of quotes"
+msgstr ""
+
+#: ../tools/cmdtool/tool-help.c:249 ../tools/cmdtool/tool-help.c:440
msgid "Usage"
msgstr "用法"
-#: ../tools/command-exec.c:636
+#: ../tools/cmdtool/tool-input.c:478
#, c-format
-msgid "Command '%s' not found\n"
-msgstr "没有找到命令“%s”\n"
+msgid "Could not save history file to '%s': %s"
+msgstr "无法保存历史文件到 '%s'：%s"
+
+#: ../tools/cmdtool/tool-output.c:162 ../tools/gda-sql.c:1815
+#, c-format
+msgid "(%d row)"
+msgid_plural "(%d rows)"
+msgstr[0] "(%d 行)"
-#: ../tools/command-exec.c:767
+#: ../tools/command-exec.c:246
msgid "History is not supported"
msgstr "不支持历史"
-#: ../tools/command-exec.c:782 ../tools/command-exec.c:820
-#: ../tools/command-exec.c:865 ../tools/command-exec.c:909
-#: ../tools/command-exec.c:1043 ../tools/gda-sql.c:3477
-#: ../tools/gda-sql.c:5489 ../tools/gda-sql.c:6224 ../tools/gda-sql.c:6450
-#: ../tools/gda-sql.c:6554
+#: ../tools/command-exec.c:262 ../tools/command-exec.c:301
+#: ../tools/command-exec.c:349 ../tools/command-exec.c:396
+#: ../tools/command-exec.c:533 ../tools/gda-sql.c:2867 ../tools/gda-sql.c:3930
+#: ../tools/gda-sql.c:4807 ../tools/gda-sql.c:5532 ../tools/gda-sql.c:5751
+#: ../tools/gda-sql.c:5837
msgid "No current connection"
msgstr "没有当前连接"
-#: ../tools/command-exec.c:847
+#: ../tools/command-exec.c:330
msgid "List of tables"
msgstr "表的列表"
-#: ../tools/command-exec.c:891
+#: ../tools/command-exec.c:377
msgid "List of views"
msgstr "视图列表"
-#: ../tools/command-exec.c:933
+#: ../tools/command-exec.c:422
msgid "List of schemas"
msgstr "方案列表"
-#: ../tools/command-exec.c:1007 ../tools/command-exec.c:1140
+#: ../tools/command-exec.c:496 ../tools/command-exec.c:632
msgid "No object found"
msgstr "未找到对象"
-#: ../tools/command-exec.c:1170 ../tools/web-server.c:926
+#: ../tools/command-exec.c:662 ../tools/web-server.c:932
msgid "Column"
msgstr "列"
-#: ../tools/command-exec.c:1172 ../tools/web-server.c:928
+#: ../tools/command-exec.c:664 ../tools/web-server.c:934
msgid "Nullable"
msgstr "可以为 NULL"
-#: ../tools/command-exec.c:1174 ../tools/web-server.c:930
+#: ../tools/command-exec.c:666 ../tools/web-server.c:936
msgid "Extra"
msgstr "额外"
-#: ../tools/command-exec.c:1177
+#: ../tools/command-exec.c:669
#, c-format
msgid "List of columns for view '%s'"
msgstr "视图 '%s' 列的列表"
-#: ../tools/command-exec.c:1181
+#: ../tools/command-exec.c:673
#, c-format
msgid "List of columns for table '%s'"
msgstr "表 '%s' 列的列表"
-#: ../tools/command-exec.c:1193 ../tools/web-server.c:941
+#: ../tools/command-exec.c:685 ../tools/web-server.c:947
msgid "yes"
msgstr "是"
-#: ../tools/command-exec.c:1193 ../tools/web-server.c:941
+#: ../tools/command-exec.c:685 ../tools/web-server.c:947
msgid "no"
msgstr "非"
-#: ../tools/command-exec.c:1224
+#: ../tools/command-exec.c:716
#, c-format
msgid "Could not determine columns of view '%s'"
msgstr ""
-#: ../tools/command-exec.c:1228
+#: ../tools/command-exec.c:720
#, c-format
msgid "Could not determine columns of table '%s'"
msgstr ""
-#: ../tools/command-exec.c:1241
+#: ../tools/command-exec.c:733
#, c-format
msgid "View definition: %s"
msgstr "视图定义：%s"
@@ -9729,7 +10028,7 @@ msgstr "视图定义：%s"
#. To translators: the term "references" is the verb
#. * "to reference" in the context of foreign keys where
#. * "table A REFERENCES table B"
-#: ../tools/command-exec.c:1398
+#: ../tools/command-exec.c:893
#, c-format
msgid "references %s"
msgstr "引用了 %s"
@@ -9737,7 +10036,7 @@ msgstr "引用了 %s"
#. To translators: the term "references" is the verb
#. * "to reference" in the context of foreign keys where
#. * "table A REFERENCES table B"
-#: ../tools/command-exec.c:1404
+#: ../tools/command-exec.c:899
#, c-format
msgid "references %s.%s"
msgstr "引用了 %s.%s"
@@ -9752,7 +10051,7 @@ msgid "Could not find provider '%s'"
msgstr "找不到提供者“%s”"
#: ../tools/config-info.c:121 ../tools/config-info.c:290
-#: ../tools/gda-sql.c:6056
+#: ../tools/gda-sql.c:5373
msgid "Attribute"
msgstr "属性"
@@ -9854,7 +10153,7 @@ msgstr "操作不支持\n"
msgid "Can't parse file '%s', ignoring it"
msgstr "无法解析文件 '%s'，忽略它"
-#: ../tools/gda-sql.c:195
+#: ../tools/gda-sql.c:196
#, c-format
msgid "GDA SQL console version "
msgstr "GDA SQL 控制台版本 "
@@ -9882,18 +10181,24 @@ msgstr ""
msgid "Separator character for CSV format"
msgstr "CSV 格式的分隔字符"
-#: ../tools/gda-sql.c:348
+#: ../tools/gda-sql.c:352
msgid "Welcome to the GDA SQL console, version "
msgstr "欢迎来到 GDA SQL 控制台，版本 "
-#: ../tools/gda-sql.c:354
-#, c-format
+#: ../tools/gda-sql.c:358
+#, fuzzy, c-format
+#| msgid ""
+#| "Type: %s to show usage and distribution terms\n"
+#| " %s or %s for help with internal commands\n"
+#| " %s (or CTRL-D) to quit\n"
+#| " (the '.' can be replaced by a '\\')\n"
+#| " or any query terminated by a semicolon\n"
+#| "\n"
msgid ""
"Type: %s to show usage and distribution terms\n"
" %s or %s for help with internal commands\n"
-" %s (or CTRL-D) to quit\n"
-" (the '.' can be replaced by a '\\')\n"
-" or any query terminated by a semicolon\n"
+" %s (or CTRL-D) to quit (the '.' can be replaced by a '\\')\n"
+" or any SQL query terminated by a semicolon\n"
"\n"
msgstr ""
"输入：%s 显示用法和颁发条款\n"
@@ -9903,473 +10208,462 @@ msgstr ""
" 或任何以 ';' 结尾的查询语句\n"
"\n"
-#: ../tools/gda-sql.c:408
-#, c-format
-msgid "Opening connection '%s' for: %s\n"
+#: ../tools/gda-sql.c:413
+#, fuzzy, c-format
+#| msgid "Opening connection '%s' for: %s\n"
+msgid "Opening connection '%s' for: "
msgstr "打开连接 '%s'，为：%s\n"
-#: ../tools/gda-sql.c:413
+#: ../tools/gda-sql.c:429
#, c-format
msgid "Can't open connection %d: %s\n"
msgstr "无法打开连接 %d：%s\n"
-#: ../tools/gda-sql.c:426
-#, c-format
-msgid "Opening connection '%s' for: %s (GDA_SQL_CNC environment variable)\n"
+#: ../tools/gda-sql.c:444
+#, fuzzy, c-format
+#| msgid "Opening connection '%s' for: %s (GDA_SQL_CNC environment variable)\n"
+msgid "Opening connection '%s' (GDA_SQL_CNC environment variable): "
msgstr "打开连接 '%s'，为：%s (GDA_SQL_CNC environment variable)\n"
-#: ../tools/gda-sql.c:431
+#: ../tools/gda-sql.c:459
#, c-format
msgid "Can't open connection defined by GDA_SQL_CNC: %s\n"
msgstr "无法打开由 GDA_SQL_CNC 定义的连接：%s\n"
-#: ../tools/gda-sql.c:446
+#: ../tools/gda-sql.c:471
#, c-format
msgid "Can't run HTTP server on port %d\n"
msgstr "无法在端口 %d 运行 HTTP 服务\n"
-#: ../tools/gda-sql.c:989
+#: ../tools/gda-sql.c:801
msgid "Connection closed"
msgstr "连接已关闭"
-#: ../tools/gda-sql.c:1002
-msgid "Invalid unnamed command"
-msgstr "无效的未命名命令"
-
-#: ../tools/gda-sql.c:1118
-msgid "Unknown internal command"
-msgstr "未知的内部错误"
-
-#: ../tools/gda-sql.c:1124
-msgid "Internal command not correctly defined"
-msgstr "内部命令未正确定义"
-
-#: ../tools/gda-sql.c:1130
-msgid "Incomplete internal command"
-msgstr "不完整的内部命令"
-
-#: ../tools/gda-sql.c:1241
+#: ../tools/gda-sql.c:896
#, c-format
msgid "Could not interpret the '%s' parameter's value"
msgstr "无法解释 '%s' 参数的值"
-#: ../tools/gda-sql.c:1258
+#: ../tools/gda-sql.c:913
#, c-format
msgid "No internal parameter named '%s' required by query"
msgstr "没有查询所需要的名为 '%s' 的内部参数"
-#: ../tools/gda-sql.c:1403
+#: ../tools/gda-sql.c:1089
#, c-format
msgid "Can't open file '%s' for writing: %s\n"
msgstr "无法为写入打开文件 '%s'：%s\n"
-#: ../tools/gda-sql.c:1416
-#, c-format
-msgid "Can't open pipe '%s': %s\n"
+#: ../tools/gda-sql.c:1103 ../tools/gda-sql.c:1112
+#, fuzzy, c-format
+#| msgid "Can't open pipe '%s': %s\n"
+msgid "Can't open pipe '%s': %s"
msgstr "无法打开管道 '%s'：%s\n"
-#: ../tools/gda-sql.c:1456
+#: ../tools/gda-sql.c:1152
#, c-format
msgid "Can't open file '%s' for reading: %s\n"
msgstr "无法打开文件 '%s' 以便读取：%s\n"
-#: ../tools/gda-sql.c:1523 ../tools/gda-sql.c:3719
+#: ../tools/gda-sql.c:1221 ../tools/gda-sql.c:3134
#, c-format
msgid "Connection name '%s' is invalid"
msgstr "连接名 '%s' 无效"
-#: ../tools/gda-sql.c:1589
+#: ../tools/gda-sql.c:1287
#, c-format
msgid "\tUsername for '%s': "
msgstr "\t'%s' 的用户名： "
-#: ../tools/gda-sql.c:1596
+#: ../tools/gda-sql.c:1294
#, c-format
msgid "No username for '%s'"
msgstr "没有 '%s' 的用户名"
-#: ../tools/gda-sql.c:1613
+#: ../tools/gda-sql.c:1311
#, c-format
msgid "\tPassword for '%s': "
msgstr "\t'%s' 的口令： "
-#: ../tools/gda-sql.c:1622
+#: ../tools/gda-sql.c:1320
#, c-format
msgid "No password for '%s'"
msgstr "没有 '%s' 的口令"
-#: ../tools/gda-sql.c:1717
+#: ../tools/gda-sql.c:1409
+#, c-format
+msgid ""
+"Date format for this connection will be: %s%c%s%c%s, where YYYY is the year, "
+"MM the month and DD the day\n"
+msgstr ""
+
+#: ../tools/gda-sql.c:1423
#, c-format
msgid ""
"All the information related to the '%s' connection will be stored in the "
"'%s' file\n"
msgstr "所有与 '%s' 关联的信息将保存在 '%s' 文件中\n"
-#: ../tools/gda-sql.c:1747
+#: ../tools/gda-sql.c:1453
#, c-format
msgid "Error getting meta data in background: %s\n"
msgstr "在背景中获取元数据出错：%s\n"
-#: ../tools/gda-sql.c:1755 ../tools/gda-sql.c:1908
+#: ../tools/gda-sql.c:1461 ../tools/gda-sql.c:1614
#, c-format
msgid ""
"Getting database schema information for connection '%s', this may take some "
"time... "
msgstr "为连接 '%s' 获取数据库方案信息，这可能需要一些时间... "
-#: ../tools/gda-sql.c:1762 ../tools/gda-sql.c:1915 ../tools/gda-sql.c:3533
+#: ../tools/gda-sql.c:1468 ../tools/gda-sql.c:1621 ../tools/gda-sql.c:2917
#, c-format
msgid "error: %s\n"
msgstr "错误：%s\n"
-#: ../tools/gda-sql.c:1769 ../tools/gda-sql.c:1922 ../tools/gda-sql.c:3540
+#: ../tools/gda-sql.c:1475 ../tools/gda-sql.c:1628 ../tools/gda-sql.c:2924
#, c-format
msgid "Done.\n"
msgstr "搞定。\n"
-#: ../tools/gda-sql.c:2109
-#, c-format
-msgid "(%d row)"
-msgid_plural "(%d rows)"
-msgstr[0] "(%d 行)"
-
-#: ../tools/gda-sql.c:2354 ../tools/gda-sql.c:2591 ../tools/gda-sql.c:2682
-#: ../tools/gda-sql.c:2695
+#: ../tools/gda-sql.c:2009 ../tools/gda-sql.c:2171 ../tools/gda-sql.c:2229
+#: ../tools/gda-sql.c:2237
#, c-format
msgid "%s [<FILE>]"
msgstr "%s [<FILE>]"
-#: ../tools/gda-sql.c:2355
+#: ../tools/gda-sql.c:2010
msgid "Show commands history, or save it to file"
msgstr "显示命令历史或保存到文件"
-#: ../tools/gda-sql.c:2365 ../tools/gda-sql.c:2378 ../tools/gda-sql.c:2391
-#: ../tools/gda-sql.c:2404 ../tools/gda-sql.c:2417 ../tools/gda-sql.c:2430
-#: ../tools/gda-sql.c:2443 ../tools/gda-sql.c:2456 ../tools/gda-sql.c:2470
+#: ../tools/gda-sql.c:2015 ../tools/gda-sql.c:2024 ../tools/gda-sql.c:2033
+#: ../tools/gda-sql.c:2042 ../tools/gda-sql.c:2051 ../tools/gda-sql.c:2060
+#: ../tools/gda-sql.c:2069 ../tools/gda-sql.c:2078 ../tools/gda-sql.c:2087
msgid "Information"
msgstr "信息"
-#: ../tools/gda-sql.c:2367
+#: ../tools/gda-sql.c:2017
#, c-format
msgid "%s [<META DATA TYPE>]"
msgstr "%s [<META DATA TYPE>]"
-#: ../tools/gda-sql.c:2368
+#: ../tools/gda-sql.c:2018
msgid ""
"Force reading the database meta data (or part of the meta data, ex:\"tables"
"\")"
msgstr "强制读取数据库元数据 (或部分元数据，例如“tables”)"
-#: ../tools/gda-sql.c:2380
+#: ../tools/gda-sql.c:2026
#, c-format
msgid "%s <fkname> <tableA>(<colA>,...) <tableB>(<colB>,...)"
msgstr "%s <fkname> <tableA>(<colA>,...) <tableB>(<colB>,...)"
-#: ../tools/gda-sql.c:2381
+#: ../tools/gda-sql.c:2027
msgid ""
"Declare a new foreign key (not actually in database): tableA references "
"tableB"
msgstr "声明一个新外键(实际不在数据库中)：tableA 引用 tableB"
-#: ../tools/gda-sql.c:2393
+#: ../tools/gda-sql.c:2035
#, c-format
msgid "%s <fkname> <tableA> <tableB>"
msgstr "%s <fkname> <tableA> <tableB>"
-#: ../tools/gda-sql.c:2394
+#: ../tools/gda-sql.c:2036
msgid "Un-declare a foreign key (not actually in database)"
msgstr "解除声明一个外键(实际不在数据库中)"
-#: ../tools/gda-sql.c:2406
+#: ../tools/gda-sql.c:2044
#, c-format
msgid "%s [<TABLE>]"
msgstr "%s [<TABLE>]"
-#: ../tools/gda-sql.c:2407
+#: ../tools/gda-sql.c:2045
msgid "List all tables (or named table)"
msgstr "列出所有表 (或有名表)"
-#: ../tools/gda-sql.c:2419
+#: ../tools/gda-sql.c:2053
#, c-format
msgid "%s [<VIEW>]"
msgstr "%s [<VIEW>]"
-#: ../tools/gda-sql.c:2420
+#: ../tools/gda-sql.c:2054
msgid "List all views (or named view)"
msgstr "列出所有视图 (或有名视图)"
-#: ../tools/gda-sql.c:2432
+#: ../tools/gda-sql.c:2062
#, c-format
msgid "%s [<SCHEMA>]"
msgstr "%s [<SCHEMA>]"
-#: ../tools/gda-sql.c:2433
+#: ../tools/gda-sql.c:2063
msgid "List all schemas (or named schema)"
msgstr "列出所有方案 (或命名方案)"
-#: ../tools/gda-sql.c:2445
+#: ../tools/gda-sql.c:2071
#, c-format
msgid "%s [<OBJ_NAME>|<SCHEMA>.*]"
msgstr "%s [<OBJ_NAME>|<SCHEMA>.*]"
-#: ../tools/gda-sql.c:2446
+#: ../tools/gda-sql.c:2072
msgid "Describe object or full list of objects"
msgstr "描述对象或对象的完整列表"
-#: ../tools/gda-sql.c:2458
+#: ../tools/gda-sql.c:2080
#, c-format
msgid "%s [<TABLE1> [<TABLE2>...]]"
msgstr "%s [<TABLE1> [<TABLE2>...]]"
-#: ../tools/gda-sql.c:2459
+#: ../tools/gda-sql.c:2081
msgid "Create a graph of all or the listed tables"
msgstr "创建一张对应所有或列出的表的图"
-#: ../tools/gda-sql.c:2472
+#: ../tools/gda-sql.c:2089
#, c-format
msgid "%s [<port> [<authentication token>]]"
msgstr "%s [<port> [<authentication token>]]"
-#: ../tools/gda-sql.c:2473
+#: ../tools/gda-sql.c:2090
msgid "Start/stop embedded HTTP server (on given port or on 12345 by default)"
msgstr "启动/停止 嵌入的 HTTP 服务器 (在给定的端口上或默认的 12345 端口)"
-#: ../tools/gda-sql.c:2487
-#, c-format
-msgid "%s [<CNC_NAME> [<DSN>|<CONNECTION STRING>]]"
+#: ../tools/gda-sql.c:2099
+#, fuzzy, c-format
+#| msgid "%s [<CNC_NAME> [<DSN>|<CONNECTION STRING>]]"
+msgid "%s [[<CNC_NAME>] [<DSN>|<CONNECTION STRING>]]"
msgstr "%s [<CNC_NAME> [<DSN>|<CONNECTION STRING>]]"
-#: ../tools/gda-sql.c:2488
+#: ../tools/gda-sql.c:2100
msgid "Opens a new connection or lists opened connections"
msgstr "打开新连接或列出打开的连接"
-#: ../tools/gda-sql.c:2500
+#: ../tools/gda-sql.c:2109
#, c-format
msgid "%s [<CNC_NAME>]"
msgstr "%s [<CNC_NAME>]"
-#: ../tools/gda-sql.c:2501
+#: ../tools/gda-sql.c:2110
msgid "Close a connection"
msgstr "关闭连接"
-#: ../tools/gda-sql.c:2513
+#: ../tools/gda-sql.c:2118
#, c-format
msgid "%s <CNC NAME> <OBJ NAME> [<OBJ NAME> ...]"
msgstr "%s <CNC NAME> <OBJ NAME> [<OBJ NAME> ...]"
-#: ../tools/gda-sql.c:2514
+#: ../tools/gda-sql.c:2119
msgid ""
"Bind connections or datasets (<OBJ NAME>) into a single new one (allowing "
"SQL commands to be executed across multiple connections and/or datasets)"
msgstr ""
-#: ../tools/gda-sql.c:2524 ../tools/gda-sql.c:2537 ../tools/gda-sql.c:2550
-#: ../tools/gda-sql.c:2563
+#: ../tools/gda-sql.c:2125 ../tools/gda-sql.c:2134 ../tools/gda-sql.c:2143
+#: ../tools/gda-sql.c:2152
msgid "DSN (data sources) management"
msgstr "DSN (数据源) 管理"
-#: ../tools/gda-sql.c:2526
+#: ../tools/gda-sql.c:2127
#, c-format
msgid "%s [<DSN>]"
msgstr "%s [<DSN>]"
-#: ../tools/gda-sql.c:2527
+#: ../tools/gda-sql.c:2128
msgid "List all DSN (or named DSN's attributes)"
msgstr "列出所有 DSN (或命名 DSN 属性)"
-#: ../tools/gda-sql.c:2539
+#: ../tools/gda-sql.c:2136
#, c-format
msgid "%s <DSN_NAME> <DSN_DEFINITION> [<DESCRIPTION>]"
msgstr "%s <DSN_NAME> <DSN_DEFINITION> [<DESCRIPTION>]"
-#: ../tools/gda-sql.c:2540
+#: ../tools/gda-sql.c:2137
msgid "Create (or modify) a DSN"
msgstr "创建 (或修改) DSN"
-#: ../tools/gda-sql.c:2552
+#: ../tools/gda-sql.c:2145
#, c-format
msgid "%s <DSN_NAME> [<DSN_NAME>...]"
msgstr "%s <DSN_NAME> [<DSN_NAME>...]"
-#: ../tools/gda-sql.c:2553
+#: ../tools/gda-sql.c:2146
msgid "Remove a DSN"
msgstr "移除一个 DSN"
-#: ../tools/gda-sql.c:2565
+#: ../tools/gda-sql.c:2154
#, c-format
msgid "%s [<PROVIDER>]"
msgstr "%s [<PROVIDER>]"
-#: ../tools/gda-sql.c:2566
+#: ../tools/gda-sql.c:2155
msgid "List all installed database providers (or named one's attributes)"
msgstr "列出所有已安装的数据库提供者 (或命令提供者的属性)"
-#: ../tools/gda-sql.c:2576 ../tools/gda-sql.c:2589 ../tools/gda-sql.c:2602
-#: ../tools/gda-sql.c:2615 ../tools/gda-sql.c:2797
+#: ../tools/gda-sql.c:2161 ../tools/gda-sql.c:2169 ../tools/gda-sql.c:2177
+#: ../tools/gda-sql.c:2185 ../tools/gda-sql.c:2299
msgid "Input/Output"
msgstr "输入/输出"
-#: ../tools/gda-sql.c:2578 ../tools/gda-sql.c:2734
+#: ../tools/gda-sql.c:2163 ../tools/gda-sql.c:2261
#, c-format
msgid "%s <FILE>"
msgstr "%s <FILE>"
-#: ../tools/gda-sql.c:2579
+#: ../tools/gda-sql.c:2164
msgid "Execute commands from file"
msgstr "从文件执行命令"
-#: ../tools/gda-sql.c:2592
+#: ../tools/gda-sql.c:2172
msgid "Send output to a file or |pipe"
msgstr "发送输出到一个文件或 |管道"
-#: ../tools/gda-sql.c:2604 ../tools/gda-sql.c:2617
+#: ../tools/gda-sql.c:2179 ../tools/gda-sql.c:2187
#, c-format
msgid "%s [<TEXT>]"
msgstr "%s [<TEXT>]"
-#: ../tools/gda-sql.c:2605
+#: ../tools/gda-sql.c:2180
msgid "Print TEXT or an empty line to standard output"
msgstr "将 TEXT 或一个空行打印到标准输入"
-#: ../tools/gda-sql.c:2618
+#: ../tools/gda-sql.c:2188
msgid "Send TEXT or an empty line to current output stream"
msgstr "将 TEXT 或一个空行发送到当前输入流"
-#: ../tools/gda-sql.c:2643
+#: ../tools/gda-sql.c:2203
#, c-format
msgid "%s [<DIR>]"
msgstr "%s [<DIR>]"
-#: ../tools/gda-sql.c:2644
+#: ../tools/gda-sql.c:2204
msgid "Change the current working directory"
msgstr "更改当前工作目录"
-#: ../tools/gda-sql.c:2657
+#: ../tools/gda-sql.c:2212
msgid "Show usage and distribution terms"
msgstr "显示使用方法和发行条款"
-#: ../tools/gda-sql.c:2669
+#: ../tools/gda-sql.c:2220
#, c-format
msgid "%s [<NAME> [<VALUE>]]"
msgstr "%s [<NAME> [<VALUE>]]"
-#: ../tools/gda-sql.c:2670
+#: ../tools/gda-sql.c:2221
msgid "Set or show an option, or list all options "
msgstr "设置或显示一个选项，或列出所有选项 "
-#: ../tools/gda-sql.c:2680 ../tools/gda-sql.c:2693 ../tools/gda-sql.c:2706
-#: ../tools/gda-sql.c:2719 ../tools/gda-sql.c:2732 ../tools/gda-sql.c:2745
-#: ../tools/gda-sql.c:2758 ../tools/gda-sql.c:2771 ../tools/gda-sql.c:2784
-#: ../tools/gda-sql.c:2824
+#: ../tools/gda-sql.c:2227 ../tools/gda-sql.c:2235 ../tools/gda-sql.c:2243
+#: ../tools/gda-sql.c:2251 ../tools/gda-sql.c:2259 ../tools/gda-sql.c:2267
+#: ../tools/gda-sql.c:2275 ../tools/gda-sql.c:2283 ../tools/gda-sql.c:2291
+#: ../tools/gda-sql.c:2317
msgid "Query buffer & query favorites"
msgstr "查询缓冲区及查询收藏"
-#: ../tools/gda-sql.c:2683
+#: ../tools/gda-sql.c:2230
msgid "Edit the query buffer (or file) with external editor"
msgstr "使用外部编辑器编辑查询缓存(或文件)"
-#: ../tools/gda-sql.c:2696
+#: ../tools/gda-sql.c:2238
msgid "Reset the query buffer (or load file into query buffer)"
msgstr "重置查询缓冲区(或将文件加载到缓冲区)"
-#: ../tools/gda-sql.c:2709
+#: ../tools/gda-sql.c:2246
msgid "Show the contents of the query buffer"
msgstr "显示查询缓存的内容"
-#: ../tools/gda-sql.c:2721
+#: ../tools/gda-sql.c:2253
#, c-format
msgid "%s [<FAVORITE_NAME>]"
msgstr "%s [<FAVORITE_NAME>]"
-#: ../tools/gda-sql.c:2722
+#: ../tools/gda-sql.c:2254
msgid "Execute contents of query buffer, or execute specified query favorite"
msgstr "执行查询缓冲区的内容，或执行指定的查询收藏"
-#: ../tools/gda-sql.c:2735
+#: ../tools/gda-sql.c:2262
msgid "Write query buffer to file"
msgstr "将查询缓存写入文件"
-#: ../tools/gda-sql.c:2747 ../tools/gda-sql.c:2760 ../tools/gda-sql.c:2773
+#: ../tools/gda-sql.c:2269 ../tools/gda-sql.c:2277 ../tools/gda-sql.c:2285
#, c-format
msgid "%s <FAVORITE_NAME>"
msgstr "%s <FAVORITE_NAME>"
-#: ../tools/gda-sql.c:2748
+#: ../tools/gda-sql.c:2270
msgid "Save query buffer as favorite"
msgstr "将查询缓冲区保存为收藏"
-#: ../tools/gda-sql.c:2761
+#: ../tools/gda-sql.c:2278
msgid "Load a query favorite into query buffer"
msgstr "将一条查询收藏加载到查询缓冲区"
-#: ../tools/gda-sql.c:2774
+#: ../tools/gda-sql.c:2286
msgid "Delete a query favorite"
msgstr "删除一条查询收藏"
-#: ../tools/gda-sql.c:2786 ../tools/gda-sql.c:2892
+#: ../tools/gda-sql.c:2293 ../tools/gda-sql.c:2362
#, c-format
msgid "%s"
msgstr "%s"
-#: ../tools/gda-sql.c:2787
+#: ../tools/gda-sql.c:2294
msgid "List all query favorites"
msgstr "列出所有查询收藏"
-#: ../tools/gda-sql.c:2800
+#: ../tools/gda-sql.c:2302
msgid "Set output format"
msgstr "设置输出格式"
-#: ../tools/gda-sql.c:2826
+#: ../tools/gda-sql.c:2319
#, c-format
msgid "%s [<NAME>|<TABLE> <COLUMN> <ROW_CONDITION>] <FILE>"
msgstr "%s [<NAME>|<TABLE> <COLUMN> <ROW_CONDITION>] <FILE>"
-#: ../tools/gda-sql.c:2827
+#: ../tools/gda-sql.c:2320
msgid "Export internal parameter or table's value to the FILE file"
msgstr "导出内部参数或表的值到 FILE 文件"
-#: ../tools/gda-sql.c:2837 ../tools/gda-sql.c:2850 ../tools/gda-sql.c:2863
-#: ../tools/gda-sql.c:2876
+#: ../tools/gda-sql.c:2325 ../tools/gda-sql.c:2334 ../tools/gda-sql.c:2343
+#: ../tools/gda-sql.c:2351
#, fuzzy
#| msgid "Execution of action"
msgid "Execution context"
msgstr "执行上下文"
-#: ../tools/gda-sql.c:2839
+#: ../tools/gda-sql.c:2327
#, c-format
msgid "%s [<NAME> [<VALUE>|_null_]]"
msgstr "%s [<NAME> [<VALUE>|_null_]]"
-#: ../tools/gda-sql.c:2840
+#: ../tools/gda-sql.c:2328
msgid "Set or show internal parameter, or list all if no parameter specified "
msgstr "设置或显示内部参数，再或者在没有指定参数时列出所有 "
-#: ../tools/gda-sql.c:2852
+#: ../tools/gda-sql.c:2336
#, c-format
msgid "%s [<NAME>]"
msgstr "%s [<NAME>]"
-#: ../tools/gda-sql.c:2853
+#: ../tools/gda-sql.c:2337
msgid "Unset (delete) internal named parameter (or all parameters)"
msgstr "取消设置(删除)内部命名参数 (或所有参数)"
-#: ../tools/gda-sql.c:2865
+#: ../tools/gda-sql.c:2345
#, c-format
msgid "%s <NAME> [<FILE>|<TABLE> <COLUMN> <ROW_CONDITION>]"
msgstr "%s <NAME> [<FILE>|<TABLE> <COLUMN> <ROW_CONDITION>]"
-#: ../tools/gda-sql.c:2866
+#: ../tools/gda-sql.c:2346
msgid ""
"Set internal parameter as the contents of the FILE file or from an existing "
"table's value"
msgstr "将内部参数设为 FILE 文件的内容或取自现在表的值"
-#: ../tools/gda-sql.c:2878
+#: ../tools/gda-sql.c:2353
#, c-format
msgid "%s <SELECT> <ROW_FIELDS> [<COLUMN_FIELDS> [<DATA_FIELDS> ...]]"
msgstr "%s <SELECT> <ROW_FIELDS> [<COLUMN_FIELDS> [<DATA_FIELDS> ...]]"
-#: ../tools/gda-sql.c:2879
+#: ../tools/gda-sql.c:2354
msgid ""
"Performs a statistical analysis on the data from SELECT, using ROW_FIELDS "
"and COLUMN_FIELDS criteria and optionally DATA_FIELDS for the data"
@@ -10377,77 +10671,77 @@ msgstr ""
"对 SELECT 的数据执行统计分析，使用数据的 ROW_FIELDS、COLUMN_FIELDS 及可选的 "
"DATA_FIELDS 作为条件"
-#: ../tools/gda-sql.c:2890 ../tools/gda-sql.c:2903 ../tools/gda-sql.c:2916
-#: ../tools/gda-sql.c:2929 ../tools/gda-sql.c:2942 ../tools/gda-sql.c:2955
+#: ../tools/gda-sql.c:2360 ../tools/gda-sql.c:2369 ../tools/gda-sql.c:2378
+#: ../tools/gda-sql.c:2387 ../tools/gda-sql.c:2396 ../tools/gda-sql.c:2405
msgid "Datasets' manipulations"
msgstr "数据集操作"
-#: ../tools/gda-sql.c:2893
+#: ../tools/gda-sql.c:2363
msgid "Lists all the datasets kept in memory for reference"
msgstr "列出内存中保持的所有数据作为参考"
-#: ../tools/gda-sql.c:2905
+#: ../tools/gda-sql.c:2371
#, c-format
msgid "%s <DATASET NAME> <PATTERN>"
msgstr "%s <DATASET NAME> <PATTERN>"
-#: ../tools/gda-sql.c:2906
+#: ../tools/gda-sql.c:2372
msgid "Show a dataset's contents where lines match a regular expression"
msgstr ""
-#: ../tools/gda-sql.c:2918
+#: ../tools/gda-sql.c:2380
#, c-format
msgid "%s <DATASET NAME> [<COLUMN> [<COLUMN> ...]]"
msgstr "%s <DATASET NAME> [<COLUMN> [<COLUMN> ...]]"
-#: ../tools/gda-sql.c:2919
+#: ../tools/gda-sql.c:2381
msgid ""
"Show a dataset's contents, showing only the specified columns if any "
"specified"
msgstr ""
-#: ../tools/gda-sql.c:2931
+#: ../tools/gda-sql.c:2389
#, c-format
msgid "%s <DATASET NAME> [<DATASET NAME> ...]"
msgstr "%s <DATASET NAME> [<DATASET NAME> ...]"
-#: ../tools/gda-sql.c:2932
+#: ../tools/gda-sql.c:2390
msgid "Remove one or more datasets"
msgstr "移除一个或多个数据集"
-#: ../tools/gda-sql.c:2944
+#: ../tools/gda-sql.c:2398
#, c-format
msgid "%s <DATASET NAME> <DATASET NAME>"
msgstr "%s <DATASET NAME> <DATASET NAME>"
-#: ../tools/gda-sql.c:2945
+#: ../tools/gda-sql.c:2399
msgid "Rename a dataset, useful to rename the '_' dataset to keep it"
msgstr "重命名一个数据集，可用于将“_”数据集改名以保留它"
-#: ../tools/gda-sql.c:2957
+#: ../tools/gda-sql.c:2407
#, c-format
msgid "%s CSV <FILE NAME>"
msgstr "%s CSV <FILE NAME>"
-#: ../tools/gda-sql.c:2958
+#: ../tools/gda-sql.c:2408
msgid "Import a dataset from a file"
msgstr "从文件导入数据集"
-#: ../tools/gda-sql.c:2971
+#: ../tools/gda-sql.c:2417
#, c-format
msgid "%s <filter> [<base|onelevel|subtree> [<base DN>]]"
msgstr "%s <filter> [<base|onelevel|subtree> [<base DN>]]"
-#: ../tools/gda-sql.c:2972
+#: ../tools/gda-sql.c:2418
msgid "Search LDAP entries"
msgstr "搜索 LDAP 记录"
-#: ../tools/gda-sql.c:2984
+#: ../tools/gda-sql.c:2425
#, c-format
msgid "%s <DN> [\"all\"|\"set\"|\"unset\"]"
msgstr "%s <DN> [\"all\"|\"set\"|\"unset\"]"
-#: ../tools/gda-sql.c:2985
+#: ../tools/gda-sql.c:2426
msgid ""
"Shows attributes for the entry identified by its DN. If the \"set\" 2nd "
"parameter is passed, then all set attributes are show, if the \"all\" 2nd "
@@ -10455,341 +10749,325 @@ msgid ""
"\"unset\" 2nd parameter is passed, then only non set attributes are shown."
msgstr ""
-#: ../tools/gda-sql.c:3001
+#: ../tools/gda-sql.c:2437
#, c-format
msgid "%s <DN> <new DN>"
msgstr "%s <DN> <new DN>"
-#: ../tools/gda-sql.c:3002
+#: ../tools/gda-sql.c:2438
msgid "Renames an LDAP entry"
msgstr "重命名一条 LDAP 记录"
-#: ../tools/gda-sql.c:3014
+#: ../tools/gda-sql.c:2445
#, c-format
msgid "%s <DN> <OPERATION> [<ATTR>[=<VALUE>]] [<ATTR>=<VALUE> ...]"
msgstr "%s <DN> <OPERATION> [<ATTR>[=<VALUE>]] [<ATTR>=<VALUE> ...]"
-#: ../tools/gda-sql.c:3015
+#: ../tools/gda-sql.c:2446
msgid ""
"Modifies an LDAP entry's attributes; <OPERATION> may be DELETE, REPLACE or "
"ADD"
msgstr "修改一条 LDAP 记录的属性；<OPERATION> 可以是 DELETE、REPLACE 或 ADD"
-#: ../tools/gda-sql.c:3029
-#, c-format
-msgid "%s [command]"
-msgstr "%s [命令]"
-
-#: ../tools/gda-sql.c:3030
-msgid "List all available commands or give help for the specified command"
-msgstr "列出所有可用命令或给出指定命令的帮助"
-
-#: ../tools/gda-sql.c:3095
+#: ../tools/gda-sql.c:2492
#, c-format
msgid "Unknown output format: '%s', reset to default"
msgstr "位置输出格式：'%s'，重置为默认"
-#: ../tools/gda-sql.c:3256
+#: ../tools/gda-sql.c:2637
msgid "DSN list"
msgstr "DSN 列表"
-#: ../tools/gda-sql.c:3310 ../tools/gda-sql.c:6577
+#: ../tools/gda-sql.c:2690 ../tools/gda-sql.c:5860
msgid "Missing arguments"
msgstr "丢失参数"
-#: ../tools/gda-sql.c:3331
+#: ../tools/gda-sql.c:2711
msgid "Missing provider name"
msgstr "丢失提供者名"
-#: ../tools/gda-sql.c:3356
+#: ../tools/gda-sql.c:2735
msgid "Missing DSN name"
msgstr "丢失 DSN 名"
-#: ../tools/gda-sql.c:3422 ../tools/gda-sql.c:3714
-#, c-format
-msgid "A connection named '%s' already exists"
-msgstr "名为 '%s' 的连接已经存在"
-
-#: ../tools/gda-sql.c:3527
+#: ../tools/gda-sql.c:2911
#, c-format
msgid "Getting database schema information, this may take some time... "
msgstr "正在获取数据库方案信息，这可能需要一些时间... "
-#: ../tools/gda-sql.c:3562
+#: ../tools/gda-sql.c:2944 ../tools/gda-sql.c:3129
+#, c-format
+msgid "A connection named '%s' already exists"
+msgstr "名为 '%s' 的连接已经存在"
+
+#: ../tools/gda-sql.c:2970
msgid "No opened connection"
msgstr "无已经打开的连接"
-#: ../tools/gda-sql.c:3573
+#: ../tools/gda-sql.c:2981
msgid "DSN or connection string"
msgstr "DSN 或连接字符串"
-#: ../tools/gda-sql.c:3665
-msgid "No connection currently opened"
-msgstr "没有当前已打开的连接"
-
-#: ../tools/gda-sql.c:3706
+#: ../tools/gda-sql.c:3121
msgid "Missing required connection names"
msgstr "丢失必须的连接名"
-#: ../tools/gda-sql.c:3729
+#: ../tools/gda-sql.c:3144
#, c-format
msgid "No connection or dataset named '%s' found"
msgstr "没有找到名为 '%s' 的连接或数据集"
#. force create of meta store
#. add existing connections to virtual connection
-#: ../tools/gda-sql.c:3751
+#: ../tools/gda-sql.c:3166
#, fuzzy
msgid "Bound connections are as:"
msgstr "绑定连接形如："
#. Translators: this string indicates that all the tables in connection named in the
#. * 1st "%s" will appear in the SQL namespace named as the 2nd "%s"
-#: ../tools/gda-sql.c:3764
+#: ../tools/gda-sql.c:3179
#, c-format
msgid "%s in the '%s' namespace"
msgstr ""
#. Translators: this string indicates that the dataset named in the 1st "%s"
#. * will appear as the table named as the 2nd "%s"
-#: ../tools/gda-sql.c:3778
+#: ../tools/gda-sql.c:3193
#, c-format
msgid "%s mapped to the %s table"
msgstr ""
-#: ../tools/gda-sql.c:3857
+#: ../tools/gda-sql.c:3268
#, c-format
msgid "No option named '%s'"
msgstr "没有名为“%s”的选项"
-#: ../tools/gda-sql.c:3869
+#: ../tools/gda-sql.c:3280
msgid "List of options"
msgstr "选项列表"
-#: ../tools/gda-sql.c:3951
+#: ../tools/gda-sql.c:3346
#, c-format
msgid "Could not get home directory: %s"
msgstr "无法获得主目录：%s"
-#: ../tools/gda-sql.c:3977
+#: ../tools/gda-sql.c:3372
#, c-format
msgid "Working directory is now: %s"
msgstr "工作目录现在为：%s"
-#: ../tools/gda-sql.c:3982
+#: ../tools/gda-sql.c:3377
#, c-format
msgid "Could not change working directory to '%s': %s"
msgstr "无法更改工作目录到 '%s'：%s"
-#: ../tools/gda-sql.c:4010 ../tools/gda-sql.c:4114 ../tools/gda-sql.c:4159
-#: ../tools/gda-sql.c:4189 ../tools/gda-sql.c:4232 ../tools/gda-sql.c:4277
-#: ../tools/gda-sql.c:4387 ../tools/gda-sql.c:4453 ../tools/gda-sql.c:4540
-#: ../tools/gda-sql.c:5252 ../tools/gda-sql.c:5339
+#: ../tools/gda-sql.c:3396 ../tools/gda-sql.c:3491 ../tools/gda-sql.c:3527
+#: ../tools/gda-sql.c:3549 ../tools/gda-sql.c:3584 ../tools/gda-sql.c:3621
+#: ../tools/gda-sql.c:3723 ../tools/gda-sql.c:3780 ../tools/gda-sql.c:3859
+#: ../tools/gda-sql.c:4579 ../tools/gda-sql.c:4666
msgid "No connection opened"
msgstr "没有打开的连接"
-#: ../tools/gda-sql.c:4028
+#: ../tools/gda-sql.c:3414
#, c-format
msgid "Could not write to temporary file '%s': %s"
msgstr "无法写入临时文件 '%s'：%s"
-#: ../tools/gda-sql.c:4064
+#: ../tools/gda-sql.c:3450
#, c-format
msgid "could not start editor '%s'"
msgstr "无法启动编辑器 '%s'"
-#: ../tools/gda-sql.c:4069
+#: ../tools/gda-sql.c:3455
msgid "Could not start /bin/sh"
msgstr "无法启动 /bin/sh"
-#: ../tools/gda-sql.c:4240
+#: ../tools/gda-sql.c:3592
msgid "Missing FILE to write to"
msgstr "丢失要写入的 FILE"
-#: ../tools/gda-sql.c:4283
+#: ../tools/gda-sql.c:3627
msgid "Favorite name"
msgstr "收藏的名称"
-#: ../tools/gda-sql.c:4284
+#: ../tools/gda-sql.c:3628
msgid "Comments"
msgstr "注释"
-#: ../tools/gda-sql.c:4285
+#: ../tools/gda-sql.c:3629
msgid "SQL"
msgstr "SQL"
-#: ../tools/gda-sql.c:4401 ../tools/gda-sql.c:4517 ../tools/gda-sql.c:4594
+#: ../tools/gda-sql.c:3737 ../tools/gda-sql.c:3845 ../tools/gda-sql.c:3913
msgid "Missing query buffer name"
msgstr "丢失查询缓存名"
-#: ../tools/gda-sql.c:4430
+#: ../tools/gda-sql.c:3766
msgid "Query buffer is empty"
msgstr "查询缓存是空的"
-#: ../tools/gda-sql.c:4485 ../tools/tools-favorites.c:1092
+#: ../tools/gda-sql.c:3813 ../tools/tools-favorites.c:1092
msgid "Could not find favorite"
msgstr "找不到收藏"
-#: ../tools/gda-sql.c:4658 ../tools/gda-sql.c:6262 ../tools/gda-sql.c:6340
+#: ../tools/gda-sql.c:3985 ../tools/gda-sql.c:5571 ../tools/gda-sql.c:5649
#, c-format
msgid "No parameter named '%s' defined"
msgstr "没有定义名为 '%s' 的参数"
-#: ../tools/gda-sql.c:4669
+#: ../tools/gda-sql.c:3996
msgid "List of defined parameters"
msgstr "已定义的参数列表"
-#: ../tools/gda-sql.c:4708
+#: ../tools/gda-sql.c:4035
msgid "dimensions (columns x rows)"
msgstr "尺寸(列 x 行)"
-#: ../tools/gda-sql.c:4709
+#: ../tools/gda-sql.c:4036
msgid "List of kept data"
msgstr "保留数据列表"
-#: ../tools/gda-sql.c:4754 ../tools/gda-sql.c:4874 ../tools/gda-sql.c:4940
-#: ../tools/gda-sql.c:4982 ../tools/gda-sql.c:5026
+#: ../tools/gda-sql.c:4081 ../tools/gda-sql.c:4201 ../tools/gda-sql.c:4267
+#: ../tools/gda-sql.c:4309 ../tools/gda-sql.c:4353
msgid "Missing argument"
msgstr "缺少参数"
-#: ../tools/gda-sql.c:4764 ../tools/gda-sql.c:4882 ../tools/gda-sql.c:4948
-#: ../tools/gda-sql.c:5035
+#: ../tools/gda-sql.c:4091 ../tools/gda-sql.c:4209 ../tools/gda-sql.c:4275
+#: ../tools/gda-sql.c:4362
#, c-format
msgid "Could not find dataset named '%s'"
msgstr "无法找到名为 '%s' 的数据集"
-#: ../tools/gda-sql.c:4903
+#: ../tools/gda-sql.c:4230
#, c-format
msgid "Could not identify column '%s'"
msgstr "无法识别列“%s”"
-#: ../tools/gda-sql.c:4973
+#: ../tools/gda-sql.c:4300
#, c-format
msgid "Unknown import format '%s'"
msgstr "未知的导入格式“%s”"
-#: ../tools/gda-sql.c:4994
+#: ../tools/gda-sql.c:4321
#, c-format
msgid "Could not import file '%s'"
msgstr "无法导入文件“%s”"
-#: ../tools/gda-sql.c:5088
+#: ../tools/gda-sql.c:4415
msgid "Missing foreign key declaration specification"
msgstr "缺少外键声明规范"
-#: ../tools/gda-sql.c:5205
+#: ../tools/gda-sql.c:4532
msgid "Malformed foreign key declaration specification"
msgstr "格式错误的外键声明规范"
-#: ../tools/gda-sql.c:5237
+#: ../tools/gda-sql.c:4564
#, c-format
msgid "Malformed table name specification '%s'"
msgstr "格式错误的表名规范“%s”"
-#: ../tools/gda-sql.c:5326 ../tools/gda-sql.c:5401
+#: ../tools/gda-sql.c:4653 ../tools/gda-sql.c:4728
msgid "Missing foreign key name argument"
msgstr "缺少外键名参数"
-#: ../tools/gda-sql.c:5433 ../tools/gda-sql.c:6605
+#: ../tools/gda-sql.c:4760 ../tools/gda-sql.c:5888
msgid "Wrong row condition"
msgstr "错误和行条件"
-#: ../tools/gda-sql.c:5461
+#: ../tools/gda-sql.c:4788
msgid "No unique row identified"
msgstr "没有发现唯一的行"
-#: ../tools/gda-sql.c:5503 ../tools/gda-sql.c:6240 ../tools/gda-sql.c:6568
-msgid "Too many arguments"
-msgstr "参数过多"
-
-#: ../tools/gda-sql.c:5551 ../tools/gda-sql.c:6268
+#: ../tools/gda-sql.c:4870 ../tools/gda-sql.c:5577
msgid "Wrong number of arguments"
msgstr "参数个数错误"
-#: ../tools/gda-sql.c:5584
+#: ../tools/gda-sql.c:4903
msgid "Missing data on which to operate"
msgstr "缺少操作的数据对象"
-#: ../tools/gda-sql.c:5589
+#: ../tools/gda-sql.c:4908
msgid "Missing row fields specifications"
msgstr "未规定行字段"
-#: ../tools/gda-sql.c:5607
+#: ../tools/gda-sql.c:4926
msgid "Wrong SELECT argument"
msgstr "错误的 SELECT 语句"
-#: ../tools/gda-sql.c:5645 ../tools/gda-sql.c:5673
+#: ../tools/gda-sql.c:4964 ../tools/gda-sql.c:4992
msgid "Wrong data field argument"
msgstr "错误的数据字段参数"
-#: ../tools/gda-sql.c:5723 ../tools/gda-sql.c:5821 ../tools/gda-sql.c:5915
-#: ../tools/gda-sql.c:6010
+#: ../tools/gda-sql.c:5042 ../tools/gda-sql.c:5139 ../tools/gda-sql.c:5232
+#: ../tools/gda-sql.c:5327
msgid "Connection is not an LDAP connection"
msgstr "连接不是 LDAP 连接"
-#: ../tools/gda-sql.c:5745
+#: ../tools/gda-sql.c:5064
#, c-format
msgid "Unknown search scope '%s'"
msgstr "未知的搜索范围“%s”"
-#: ../tools/gda-sql.c:5755
+#: ../tools/gda-sql.c:5074
msgid "Missing filter which to operate"
msgstr "缺少要操作的过滤器"
-#: ../tools/gda-sql.c:5836
+#: ../tools/gda-sql.c:5154
msgid "Missing current DN or new DN specification"
msgstr "未规定当前 DN 或 新 DN"
-#: ../tools/gda-sql.c:5930
+#: ../tools/gda-sql.c:5247
msgid "Missing DN of LDAP entry"
msgstr "缺少 LDAP 记录的 DN"
-#: ../tools/gda-sql.c:5935
+#: ../tools/gda-sql.c:5252
msgid "Missing operation to perform on LDAP entry's attributes"
msgstr "缺少在 LDAP 记录属性上执行的操作"
-#: ../tools/gda-sql.c:5947
+#: ../tools/gda-sql.c:5264
#, c-format
msgid "Unknown operation '%s' to perform on LDAP entry's attributes"
msgstr "未知的对 LDAP 记录属性的操作“%s”"
-#: ../tools/gda-sql.c:5968
-#, c-format
-msgid "Wrong attribute value specification"
+#: ../tools/gda-sql.c:5285
+#, fuzzy, c-format
+#| msgid "Wrong attribute value specification"
+msgid "Wrong attribute value specification '%s'"
msgstr "错误的属性值规定"
-#: ../tools/gda-sql.c:6024
+#: ../tools/gda-sql.c:5341
msgid "Missing DN (Distinguished name) argument"
msgstr "缺少 DN(识别名称) 参数"
-#: ../tools/gda-sql.c:6037
+#: ../tools/gda-sql.c:5354
#, c-format
msgid "Unknown '%s' argument"
msgstr "未知的“%s”参数"
-#: ../tools/gda-sql.c:6048
+#: ../tools/gda-sql.c:5365
#, c-format
msgid "Could not find entry with DN '%s'"
msgstr "找不到 DN 为“%s”的记录"
-#: ../tools/gda-sql.c:6057
+#: ../tools/gda-sql.c:5374
msgid "Required?"
msgstr "要求？"
-#: ../tools/gda-sql.c:6059
+#: ../tools/gda-sql.c:5376
msgid "LDAP entry's Attributes"
msgstr "LDAP 记录的属性"
-#: ../tools/gda-sql.c:6280 ../tools/gda-sql.c:6294
+#: ../tools/gda-sql.c:5589 ../tools/gda-sql.c:5603
msgid "Could not write file"
msgstr "不能写入文件"
-#: ../tools/gda-sql.c:6419
+#: ../tools/gda-sql.c:5728
#, c-format
msgid "Graph written to '%s'\n"
msgstr "图已写入“%s”\n"
-#: ../tools/gda-sql.c:6422
+#: ../tools/gda-sql.c:5731
#, c-format
msgid ""
"Graph written to '%s'\n"
@@ -10803,23 +11081,23 @@ msgstr ""
"\tdot -Tpng -o graph.png %s\n"
"注：请设置环境变量 GDA_SQL_VIEWER_PNG 或 GDA_SQL_VIEWER_PDF 来查看对应的图\n"
-#: ../tools/gda-sql.c:6496
+#: ../tools/gda-sql.c:5788
msgid "HTTPD server stopped"
msgstr "HTTPD 服务器已停止"
-#: ../tools/gda-sql.c:6515
+#: ../tools/gda-sql.c:5807
msgid "Could not start HTTPD server"
msgstr "无法启动 HTTPD 服务器"
-#: ../tools/gda-sql.c:6519
+#: ../tools/gda-sql.c:5811
msgid "HTTPD server started"
msgstr "HTTPD 服务器已启动"
-#: ../tools/gda-sql.c:6524
+#: ../tools/gda-sql.c:5816
msgid "Invalid port specification"
msgstr "无效的端口指定"
-#: ../tools/gda-sql.c:6740
+#: ../tools/gda-sql.c:6009
msgid "Command is incomplete"
msgstr "命令不完整"
@@ -10835,147 +11113,187 @@ msgstr "控制台"
msgid "Can't initialize dictionary to store favorites"
msgstr "无法初始化目录以存储收藏"
-#: ../tools/tools-input.c:322
-#, c-format
-msgid "Could not save history file to '%s': %s"
-msgstr "无法保存历史文件到 '%s'：%s"
-
-#: ../tools/tools-utils.c:37
+#: ../tools/tool-utils.c:37
msgid "not enforced"
msgstr "非强制的"
-#: ../tools/tools-utils.c:39
+#: ../tools/tool-utils.c:39
msgid "stop with error"
msgstr "出错时停止"
-#: ../tools/tools-utils.c:41
+#: ../tools/tool-utils.c:41
msgid "stop with error, not deferrable"
msgstr "出错时停止，无延迟"
-#: ../tools/tools-utils.c:43
+#: ../tools/tool-utils.c:43
msgid "cascade changes"
msgstr "级联更改"
-#: ../tools/tools-utils.c:45
+#: ../tools/tool-utils.c:45
msgid "set to NULL"
msgstr "设置为 NULL"
-#: ../tools/tools-utils.c:47
+#: ../tools/tool-utils.c:47
msgid "set to default value"
msgstr "设置为默认值"
-#: ../tools/web-server.c:563 ../tools/web-server.c:564
+#: ../tools/web-server.c:569 ../tools/web-server.c:570
msgid "Authentication required"
msgstr "要求认证"
-#: ../tools/web-server.c:566
+#: ../tools/web-server.c:572
msgid ""
"Enter authentification token as set from console, or leave empty if none "
"required"
msgstr "输入终端中设置的认证令牌，若不需要则留空"
-#: ../tools/web-server.c:632
+#: ../tools/web-server.c:638
msgid "Token:"
msgstr "令牌"
-#: ../tools/web-server.c:773
+#: ../tools/web-server.c:779
msgid "SQL console:"
msgstr "SQL 控制台："
-#: ../tools/web-server.c:853 ../tools/web-server.c:1873
+#: ../tools/web-server.c:859 ../tools/web-server.c:1879
msgid "Tables"
msgstr "表"
-#: ../tools/web-server.c:853
+#: ../tools/web-server.c:859
#, c-format
msgid "Tables in the '%s' schema"
msgstr "'%s' 方案中的表"
-#: ../tools/web-server.c:859 ../tools/web-server.c:1878
+#: ../tools/web-server.c:865 ../tools/web-server.c:1884
msgid "Views"
msgstr "视图"
-#: ../tools/web-server.c:859
+#: ../tools/web-server.c:865
#, c-format
msgid "Views in the '%s' schema"
msgstr "'%s' 方案中的视图"
-#: ../tools/web-server.c:918
+#: ../tools/web-server.c:924
#, c-format
msgid "Columns for the '%s' table:"
msgstr "'%s' 表的列："
-#: ../tools/web-server.c:964
+#: ../tools/web-server.c:970
msgid "Primary key:"
msgstr "主键："
-#: ../tools/web-server.c:1069
+#: ../tools/web-server.c:1075
msgid "Relations:"
msgstr "关系："
-#: ../tools/web-server.c:1086
+#: ../tools/web-server.c:1092
msgid "Foreign keys:"
msgstr "外键："
-#: ../tools/web-server.c:1098
+#: ../tools/web-server.c:1104
#, c-format
msgid "To '%s':"
msgstr "到 '%s'："
-#: ../tools/web-server.c:1273
+#: ../tools/web-server.c:1279
msgid "View definition:"
msgstr "视图定义："
-#: ../tools/web-server.c:1348
+#: ../tools/web-server.c:1354
#, c-format
msgid "Trigger '%s' for the '%s.%s' table:"
msgstr "'%s.%s' 表的触发器 '%s'："
-#: ../tools/web-server.c:1368
+#: ../tools/web-server.c:1374
#, c-format
msgid "Trigger fired for: %s"
msgstr "触发器触发，为：%s"
-#: ../tools/web-server.c:1372
+#: ../tools/web-server.c:1378
#, c-format
msgid "Time at which the trigger is fired: %s"
msgstr "触发器的触发时间：%s"
-#: ../tools/web-server.c:1376
+#: ../tools/web-server.c:1382
msgid "Action:"
msgstr "操作："
-#: ../tools/web-server.c:1605
+#: ../tools/web-server.c:1611
msgid "Triggers:"
msgstr "触发器："
-#: ../tools/web-server.c:1637 ../tools/web-server.c:1731
+#: ../tools/web-server.c:1643 ../tools/web-server.c:1737
#, c-format
msgid "For the '%s.%s' table:"
msgstr "对于 '%s.%s' 表"
-#: ../tools/web-server.c:1703
+#: ../tools/web-server.c:1709
#, c-format
msgid "Triggers in the '%s' schema:"
msgstr "'%s' 方案中的触发器："
-#: ../tools/web-server.c:1857
+#: ../tools/web-server.c:1863
#, c-format
msgid "Database information for '%s'"
msgstr "对 '%s' 的数据库信息"
-#: ../tools/web-server.c:1862
+#: ../tools/web-server.c:1868
msgid "Database information"
msgstr "数据库信息："
-#: ../tools/web-server.c:1871
+#: ../tools/web-server.c:1877
msgid "Objects"
msgstr "对象"
-#: ../tools/web-server.c:1883
+#: ../tools/web-server.c:1889
msgid "Triggers"
msgstr "触发器"
+#~ msgid "Binary handler"
+#~ msgstr "二进制处理程序"
+
+#~ msgid "Boolean values handler"
+#~ msgstr "布尔值处理程序"
+
+#~ msgid "Strings handler"
+#~ msgstr "字符串处理程序"
+
+#~ msgid "Time and Date handler"
+#~ msgstr "时间和日期处理程序"
+
+#~ msgid "Gda type handler"
+#~ msgstr "Gda 类型处理程序"
+
+#~ msgid "SQlite binary handler"
+#~ msgstr "SQlite 二进制处理程序"
+
+#~ msgid "The connection string must contain the URL value"
+#~ msgstr "连接字符串必须包含 URL 值"
+
+#~ msgid "User name"
+#~ msgstr "用户名"
+
+#~ msgid "Postgresql binary handler"
+#~ msgstr "Postgresql 二进制处理程序"
+
+#~ msgid "Unknown internal command"
+#~ msgstr "未知的内部错误"
+
+#~ msgid "Internal command not correctly defined"
+#~ msgstr "内部命令未正确定义"
+
+#~ msgid "Incomplete internal command"
+#~ msgstr "不完整的内部命令"
+
+#~ msgid "%s [command]"
+#~ msgstr "%s [命令]"
+
+#~ msgid "List all available commands or give help for the specified command"
+#~ msgstr "列出所有可用命令或给出指定命令的帮助"
+
+#~ msgid "No connection currently opened"
+#~ msgstr "没有当前已打开的连接"
+
#~| msgid "No data source defined"
#~ msgid "No column field defined"
#~ msgstr "没有定义列字段"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
