[libgda] Update Chinese (China) translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Update Chinese (China) translation
- Date: Sun, 20 Mar 2022 14:40:05 +0000 (UTC)
commit 3b77bb8514a9af514da6c558dff354f5c24e47dc
Author: Boyuan Yang <073plan gmail com>
Date: Sun Mar 20 14:40:01 2022 +0000
Update Chinese (China) translation
po/zh_CN.po | 8561 +++++++++++++++++++++++++++++++++--------------------------
1 file changed, 4824 insertions(+), 3737 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a4926c76c..20f8881b7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,33 +5,34 @@
# YunQiang Su <wzssyqa gmail com>, 2010.
# Wylmer Wang <wantinghard gmail com>, 2010-2012, 2014.
# Aron Xu <aronxu gnome org>, 2011.
+# Zhou Nan<zhounan nfschina com>, 2021.
#
-
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: 2014-02-06 15:17+0000\n"
-"PO-Revision-Date: 2014-01-05 15:51+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libgda/issues\n";
+"POT-Creation-Date: 2022-01-06 16:42+0000\n"
+"PO-Revision-Date: 2022-03-20 10:39-0400\n"
+"Last-Translator: Zhou Nan<zhounan nfschina 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: Poedit 2.4.3\n"
+
+#: ../control-center/dsn-config.c:79
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:378
+msgid "_Delete"
+msgstr "删除(_D)"
#. title
-#: ../control-center/dsn-config.c:136 ../control-center/main.c:380
+#: ../control-center/dsn-config.c:181
msgid "Data Sources"
msgstr "数据源"
-#: ../control-center/dsn-config.c:137
-msgid "Configured data sources in the system"
-msgstr "在系统中配置了的数据源"
-
-#: ../control-center/dsn-config.c:186
+#: ../control-center/dsn-config.c:182
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 "
@@ -40,202 +41,221 @@ msgstr ""
"数据源是识别数据库连接的途径：所有打开某个“提供者”的特定数据库连接所需的信息"
"使用一个唯一的名字来引用。"
-#: ../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:272
-msgid "Data source removal confirmation"
-msgstr "数据源删除确认"
-
-#. create the dialog
-#: ../control-center/dsn-properties-dialog.c:107
-#: ../control-center/dsn-properties-dialog.c:147
-#: ../control-center/dsn-properties-dialog.c:151
-msgid "Data Source Properties"
-msgstr "数据源属性"
+#: ../control-center/dsn-config.c:256
+msgid "No data source selected."
+msgstr "未选中数据源。"
-#: ../control-center/dsn-properties-dialog.c:109
-msgid "Test"
-msgstr "测试"
+#: ../control-center/dsn-config.c:281
+#: ../providers/bdbsql/bdbsql_specs_create_view.xml.in.h:7
+#: ../providers/mysql/mysql_specs_create_view.xml.in.h:6
+#: ../providers/postgres/postgres_specs_create_view.xml.in.h:7
+#: ../providers/sqlcipher/sqlcipher_specs_create_view.xml.in.h:7
+#: ../providers/sqlite/sqlite_specs_create_view.xml.in.h:7
+msgid "Definition"
+msgstr "定义"
-#: ../control-center/dsn-properties-dialog.c:110
-msgid "Browse"
-msgstr "浏览器"
+#: ../control-center/dsn-config.c:287 ../tools/common/t-config-info.c:343
+msgid "Parameters"
+msgstr "参数"
-#: ../control-center/dsn-properties-dialog.c:148
-msgid "Change the data source properties (the name can't be modified)."
-msgstr "更改数据源属性 (名称不可更改)。"
+#: ../control-center/dsn-config.c:293 ../libgda/gda-config.c:1768
+#: ../tools/browser/auth-dialog.c:266 ../tools/common/t-config-info.c:207
+#: ../tools/common/t-config-info.c:367
+msgid "Authentication"
+msgstr "认证"
-#: ../control-center/dsn-properties-dialog.c:152
-msgid ""
-"For information only, this data source is a system wide data source\n"
-"and you don't have the permission change it."
-msgstr "要只获取信息，此数据源是全系统数据源并且您没有权限修改它。"
+#: ../control-center/dsn-config.c:303
+msgid "Write changes made to the DSN"
+msgstr "写入对 DSN 所做的更改"
-#: ../control-center/dsn-properties-dialog.c:202
+#: ../control-center/dsn-config.c:367
#, c-format
-msgid "Login for %s"
-msgstr "登录为 %s"
-
-#: ../control-center/dsn-properties-dialog.c:224
-msgid "Connection successfully opened!"
-msgstr "连接成功打开！"
-
-#: ../control-center/dsn-properties-dialog.c:231
-msgid "Could not open connection"
-msgstr "无法打开连接"
-
-#: ../control-center/dsn-properties-dialog.c:232
-#: ../control-center/gdaui-dsn-assistant.c:138
-#: ../libgda-ui/gdaui-raw-form.c:631
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: ../control-center/dsn-properties-dialog.c:268
-msgid "Could not execute browser program"
-msgstr "无法执行浏览器程序"
+msgid "Could not save DSN definition: %s"
+msgstr "无法保存 DSN 定义：%s"
#. FIXME: add a notice somewhere in the UI
-#: ../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:1414
-#: ../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:413
-#: ../libgda/gda-data-select.c:2329 ../libgda/gda-data-select.c:2339
-#: ../libgda/gda-data-select.c:3787 ../libgda/gda-holder.c:545
-#: ../libgda/gda-holder.c:1954 ../libgda/gda-meta-store.c:1011
-#: ../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:2689
-#: ../libgda/sqlite/gda-sqlite-provider.c:2701
-#: ../libgda/sqlite/gda-sqlite-provider.c:2723
-#: ../libgda/sqlite/gda-sqlite-provider.c:2913
-#: ../libgda/sqlite/gda-sqlite-provider.c:3244
-#: ../libgda/sqlite/gda-sqlite-provider.c:3256
-#: ../libgda/sqlite/gda-sqlite-provider.c:3387
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:128
-#: ../libgda/sqlite/virtual/gda-ldap-connection.c:250
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:438
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:833
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1561
-#: ../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
-#: ../libgda-ui/data-entries/plugins/common-pict.c:222
-#: ../libgda-ui/data-entries/plugins/common-pict.c:265
-#: ../libgda-ui/data-entries/plugins/common-pict.c:424
-#: ../libgda-ui/data-entries/plugins/common-pict.c:536
-#: ../libgda-ui/demos/main.c:779 ../libgda-ui/gdaui-data-filter.c:161
-#: ../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:519
-#: ../providers/jdbc/gda-jdbc-provider.c:1449
-#: ../providers/jdbc/gda-jdbc-provider.c:1478
-#: ../providers/jdbc/gda-jdbc-provider.c:1538
-#: ../providers/jdbc/gda-jdbc-provider.c:1604
-#: ../providers/jdbc/gda-jdbc-util.c:45 ../providers/jdbc/libmain.c:154
-#: ../providers/jdbc/libmain.c:164 ../providers/jdbc/libmain.c:480
-#: ../providers/ldap/gda-ldap-provider.c:842
-#: ../providers/ldap/gda-ldap-provider.c:852
+#: ../control-center/dsn-config.c:367 ../control-center/gdaui-dsn-editor.c:354
+#: ../libgda/gda-config.c:525 ../libgda/gda-config.c:676
+#: ../libgda/gda-config.c:1185 ../libgda/gda-config.c:1297
+#: ../libgda/gda-config.c:1355 ../libgda/gda-config.c:1432
+#: ../libgda/gda-config.c:1870 ../libgda/gda-connection.c:1546
+#: ../libgda/gda-data-model.c:2295 ../libgda/gda-data-model.c:2303
+#: ../libgda/gda-data-model-dir.c:339 ../libgda/gda-data-model-import.c:1705
+#: ../libgda/gda-data-pivot.c:1219 ../libgda/gda-data-pivot.c:1249
+#: ../libgda/gda-data-pivot.c:1350 ../libgda/gda-data-pivot.c:1464
+#: ../libgda/gda-data-proxy.c:3099 ../libgda/gda-data-select.c:2371
+#: ../libgda/gda-data-select.c:2381 ../libgda/gda-data-select.c:3764
+#: ../libgda/gda-holder.c:504 ../libgda/gda-holder.c:1975
+#: ../libgda/gda-meta-store.c:1209 ../libgda/gda-meta-store.c:1215
+#: ../libgda/gda-server-operation.c:656 ../libgda/gda-server-operation.c:1111
+#: ../libgda/gda-set.c:1158 ../libgda/gda-tree-mgr-select.c:142
+#: ../libgda/gda-tree-mgr-select.c:176 ../libgda-report/engine/rt-parser.c:1197
+#: ../libgda-report/engine/rt-parser.c:1198
+#: ../libgda-report/engine/rt-parser.c:1417
+#: ../libgda-report/engine/rt-parser.c:1418
+#: ../libgda/sqlite/gda-sqlite-provider.c:3074
+#: ../libgda/sqlite/gda-sqlite-provider.c:3086
+#: ../libgda/sqlite/gda-sqlite-provider.c:3297
+#: ../libgda/sqlite/gda-sqlite-provider.c:3635
+#: ../libgda/sqlite/gda-sqlite-provider.c:3647
+#: ../libgda/sqlite/gda-sqlite-provider.c:3749
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:422
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:834
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1007
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1576
+#: ../libgda-ui/data-entries/common-bin.c:47
+#: ../libgda-ui/data-entries/common-bin.c:183
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:248
+#: ../libgda-ui/data-entries/plugins/common-pict.c:225
+#: ../libgda-ui/data-entries/plugins/common-pict.c:366
+#: ../libgda-ui/data-entries/plugins/common-pict.c:484
+#: ../libgda-ui/demos/main.c:775 ../libgda-ui/gdaui-data-filter.c:131
+#: ../libgda-ui/gdaui-init.c:543 ../libgda-ui/gdaui-login.c:420
+#: ../libgda-ui/gdaui-rt-editor.c:727 ../providers/jdbc/gda-jdbc-provider.c:525
+#: ../providers/jdbc/gda-jdbc-provider.c:1454
+#: ../providers/jdbc/gda-jdbc-provider.c:1483
+#: ../providers/jdbc/gda-jdbc-provider.c:1543
+#: ../providers/jdbc/gda-jdbc-provider.c:1609
+#: ../providers/jdbc/gda-jdbc-util.c:45 ../providers/jdbc/libmain.c:155
+#: ../providers/jdbc/libmain.c:165 ../providers/jdbc/libmain.c:514
+#: ../providers/ldap/gda-ldap-connection.c:129
+#: ../providers/ldap/gda-ldap-connection.c:261
#: ../providers/ldap/gda-ldap-provider.c:894
-#: ../providers/ldap/gda-ldap-provider.c:905
-#: ../providers/ldap/gda-ldap-provider.c:966
-#: ../providers/mdb/gda-mdb-provider.c:375
-#: ../providers/mysql/gda-mysql-provider.c:2030
-#: ../providers/mysql/gda-mysql-provider.c:2045
+#: ../providers/ldap/gda-ldap-provider.c:904
+#: ../providers/ldap/gda-ldap-provider.c:946
+#: ../providers/ldap/gda-ldap-provider.c:957
+#: ../providers/ldap/gda-ldap-provider.c:1018
+#: ../providers/mdb/gda-mdb-provider.c:374
+#: ../providers/mysql/gda-mysql-provider.c:1974
+#: ../providers/mysql/gda-mysql-provider.c:1989
#: ../providers/mysql/gda-mysql-util.c:69
-#: ../providers/postgres/gda-postgres-provider.c:1832
-#: ../providers/postgres/gda-postgres-provider.c:1847
-#: ../providers/postgres/gda-postgres-util.c:104
-#: ../providers/postgres/gda-postgres-util.c:107
-#: ../tools/browser/auth-dialog.c:676 ../tools/browser/auth-dialog.c:679
-#: ../tools/browser/browser-connection.c:239
-#: ../tools/browser/browser-connection.c:359
-#: ../tools/browser/browser-connection.c:651
-#: ../tools/browser/browser-window.c:920 ../tools/browser/browser-window.c:934
-#: ../tools/browser/browser-window.c:948
-#: ../tools/browser/browser-window.c:1173
-#: ../tools/browser/browser-window.c:1214
-#: ../tools/browser/browser-window.c:1482
+#: ../providers/postgres/gda-postgres-provider.c:1787
+#: ../providers/postgres/gda-postgres-provider.c:1802
+#: ../providers/postgres/gda-postgres-util.c:106
+#: ../providers/postgres/gda-postgres-util.c:109
+#: ../providers/reuseable/postgres/gda-postgres-reuseable.c:194
+#: ../providers/reuseable/postgres/gda-postgres-reuseable.c:318
+#: ../tools/base/base-tool-input.c:107 ../tools/browser/auth-dialog.c:618
+#: ../tools/browser/auth-dialog.c:621 ../tools/browser/browser-window.c:618
+#: ../tools/browser/browser-window.c:633 ../tools/browser/browser-window.c:648
+#: ../tools/browser/browser-window.c:699 ../tools/browser/browser-window.c:708
+#: ../tools/browser/browser-window.c:731 ../tools/browser/browser-window.c:941
#: ../tools/browser/canvas/browser-canvas-db-relations.c:423
#: ../tools/browser/canvas/browser-canvas-fkey.c:474
-#: ../tools/browser/common/ui-formgrid.c:649
-#: ../tools/browser/common/ui-formgrid.c:761
#: ../tools/browser/data-manager/analyser.c:278
-#: ../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:432
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:438
+#: ../tools/browser/data-manager/data-console.c:553
+#: ../tools/browser/data-manager/data-favorite-selector.c:193
+#: ../tools/browser/data-manager/data-favorite-selector.c:251
+#: ../tools/browser/data-manager/data-favorite-selector.c:599
+#: ../tools/browser/data-manager/data-widget.c:384
+#: ../tools/browser/ldap-browser/entry-properties.c:245
+#: ../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: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:371
-#: ../tools/browser/login-dialog.c:235 ../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:760
-#: ../tools/browser/query-exec/query-console-page.c:790
-#: ../tools/browser/query-exec/query-console-page.c:947
-#: ../tools/browser/query-exec/query-console-page.c:1018
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:585
+#: ../tools/browser/ldap-browser/ldap-search-page.c:332
+#: ../tools/browser/login-dialog.c:230
+#: ../tools/browser/query-exec/query-console-page.c:758
+#: ../tools/browser/query-exec/query-console-page.c:788
+#: ../tools/browser/query-exec/query-console-page.c:944
+#: ../tools/browser/query-exec/query-console-page.c:1016
#: ../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
-#: ../tools/browser/query-exec/query-favorite-selector.c:707
+#: ../tools/browser/query-exec/query-favorite-selector.c:696
#: ../tools/browser/query-exec/query-result.c:286
-#: ../tools/browser/query-exec/query-result.c:503
+#: ../tools/browser/query-exec/query-result.c:482
#: ../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:952
-#: ../tools/browser/schema-browser/table-info.c:470
-#: ../tools/browser/schema-browser/table-info.c:538
-#: ../tools/browser/schema-browser/table-info.c:840
-#: ../tools/browser/schema-browser/table-info.c:957
-#: ../tools/browser/schema-browser/table-preferences.c:700
-#: ../tools/browser/schema-browser/table-preferences.c:773
-#: ../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:1452
-#: ../tools/gda-sql.c:1467 ../tools/gda-sql.c:1620 ../tools/gda-sql.c:2916
-#: ../tools/web-server.c:2025
+#: ../tools/browser/schema-browser/relations-diagram.c:244
+#: ../tools/browser/schema-browser/table-columns.c:962
+#: ../tools/browser/schema-browser/table-info.c:520
+#: ../tools/browser/schema-browser/table-info.c:590
+#: ../tools/browser/schema-browser/table-info.c:880
+#: ../tools/browser/schema-browser/table-info.c:993
+#: ../tools/browser/schema-browser/table-preferences.c:690
+#: ../tools/browser/schema-browser/table-preferences.c:763
+#: ../tools/browser/ui-formgrid.c:725 ../tools/common/t-app.c:2838
+#: ../tools/common/t-connection.c:298 ../tools/common/t-connection.c:438
+#: ../tools/common/t-connection.c:1210 ../tools/common/t-connection.c:1212
+#: ../tools/common/t-term-context.c:340 ../tools/common/web-server.c:1981
+#: ../tools/misc/gda-list-server-op.c:68 ../tools/misc/gda-list-server-op.c:126
+#, c-format
msgid "No detail"
msgstr "无细节"
-#: ../control-center/gda-control-center-6.0.desktop.in.h:1
-#: ../control-center/main.c:177 ../control-center/main.c:267
+#: ../control-center/dsn-config.c:415
+#, c-format
+msgid "Are you sure you want to remove the data source '%s'?"
+msgstr "确定要移除数据源 '%s' 吗？"
+
+#: ../control-center/dsn-config.c:420
+msgid "Data source removal confirmation"
+msgstr "数据源删除确认"
+
+#: ../control-center/gda-control-center-6.0.appdata.xml.in.h:1
+msgid ""
+"From the database control center, you can manage the defined data sources "
+"(database connections), and check which database providers are installed "
+"(and usable to connect to different databases)."
+msgstr ""
+
+#: ../control-center/gda-control-center-6.0.desktop.in.in.h:1
msgid "Database access control center"
msgstr "数据库访问控制中心"
-#: ../control-center/gda-control-center-6.0.desktop.in.h:2
+#: ../control-center/gda-control-center-6.0.desktop.in.in.h:2
+msgid "Gda Control Center"
+msgstr "Gda 控制中心"
+
+#: ../control-center/gda-control-center-6.0.desktop.in.in.h:3
msgid "Configure your database access environment"
msgstr "配置您的数据库访问环境"
-#: ../control-center/gdaui-dsn-assistant.c:125
-msgid "Missing mandatory information, to create database"
+#: ../control-center/gda-control-center-6.0.desktop.in.in.h:4
+msgid "SGBD;PostgreSQL;MySQL;SQLite;JDBC;LDAP;DSN;"
+msgstr "SGBD;PostgreSQL;MySQL;SQLite;JDBC;LDAP;DSN;"
+
+#: ../control-center/gdaui-dsn-assistant.c:121
+#, fuzzy, c-format
+#| msgid "Missing mandatory information, to create database"
+msgid "Missing mandatory information, to create database: '%s'"
msgstr "丢失创建数据库必需的信息"
-#: ../control-center/gdaui-dsn-assistant.c:137
+#: ../control-center/gdaui-dsn-assistant.c:135
#, c-format
msgid "Error creating database: %s"
msgstr "创建数据库错误：%s"
-#: ../control-center/gdaui-dsn-assistant.c:418
+#: ../control-center/gdaui-dsn-assistant.c:136
+#: ../libgda-ui/gdaui-raw-form.c:217
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: ../control-center/gdaui-dsn-assistant.c:283
+#, fuzzy
+#| msgid "No provider specified"
+msgid "No provider exists"
+msgstr "没有指定的提供者"
+
+#: ../control-center/gdaui-dsn-assistant.c:410
+#, fuzzy
+#| msgid "No provider '%s' installed"
+msgid "No providers exists"
+msgstr "没有安装的 '%s' 提供者"
+
+#: ../control-center/gdaui-dsn-assistant.c:425
+#, fuzzy
+#| msgid "No provider '%s' installed"
+msgid "No provider's information exists"
+msgstr "没有安装的 '%s' 提供者"
+
+#: ../control-center/gdaui-dsn-assistant.c:458
msgid "New data source definition"
msgstr "新数据源定义"
-#: ../control-center/gdaui-dsn-assistant.c:436
+#: ../control-center/gdaui-dsn-assistant.c:476
msgid ""
"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"
@@ -246,11 +266,11 @@ msgstr ""
"\n"
"按步骤操作即可！"
-#: ../control-center/gdaui-dsn-assistant.c:442
+#: ../control-center/gdaui-dsn-assistant.c:482
msgid "Add a new data source..."
msgstr "添加一个新数据源..."
-#: ../control-center/gdaui-dsn-assistant.c:461
+#: ../control-center/gdaui-dsn-assistant.c:500
msgid ""
"The following fields represent the basic information items for your new data "
"source. Mandatory fields are marked with a star. To create a local database "
@@ -259,106 +279,99 @@ msgstr ""
"以下字段描述了您的新数据源的基本信息项。必填字段标有星号。要在文件中创建一个"
"本地数据库，请选择“SQLite”类型的数据库。"
-#: ../control-center/gdaui-dsn-assistant.c:469
+#: ../control-center/gdaui-dsn-assistant.c:508
+#: ../control-center/gdaui-dsn-editor.c:428
msgid "Data source name"
msgstr "数据源名称"
-#: ../control-center/gdaui-dsn-assistant.c:484
+#: ../control-center/gdaui-dsn-assistant.c:522
msgid "System wide data source:"
msgstr "系统全数据源："
-#: ../control-center/gdaui-dsn-assistant.c:494
+#: ../control-center/gdaui-dsn-assistant.c:531
msgid "Database type"
msgstr "数据库类型"
-#: ../control-center/gdaui-dsn-assistant.c:504
-#: ../tools/browser/ldap-browser/class-properties.c:416
+#: ../control-center/gdaui-dsn-assistant.c:540
+#: ../tools/browser/ldap-browser/class-properties.c:417
msgid "Description:"
msgstr "描述："
-#: ../control-center/gdaui-dsn-assistant.c:516
+#: ../control-center/gdaui-dsn-assistant.c:552
msgid "General Information"
msgstr "一般信息"
-#: ../control-center/gdaui-dsn-assistant.c:533
+#: ../control-center/gdaui-dsn-assistant.c:567
msgid ""
"This page lets you choose between using an existing database or to create a "
"new database to use with this new data source"
msgstr "此页中您可以选择使用现有数据库或，创建一个带有新数据源的新数据库"
-#: ../control-center/gdaui-dsn-assistant.c:538
+#: ../control-center/gdaui-dsn-assistant.c:572
msgid "Create a new database:"
msgstr "创建一个新数据库："
-#: ../control-center/gdaui-dsn-assistant.c:547
+#: ../control-center/gdaui-dsn-assistant.c:583
msgid "Create a new database?"
msgstr "创建一个新数据库？"
-#: ../control-center/gdaui-dsn-assistant.c:559
+#: ../control-center/gdaui-dsn-assistant.c:593
+#, 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."
msgid ""
"The following fields represent the information needed to create a new "
-"database (mandatory fields are marked with a star).This information is "
+"database (mandatory fields are marked with a star). This information is "
"database-specific, so check the manual for more information."
msgstr ""
"以下字段描述了创建一个新数据库所需的信息(必填字段标有星号)。该信息是针对特定"
"数据库的，所以请查阅手册了解详细信息。"
-#: ../control-center/gdaui-dsn-assistant.c:583
+#: ../control-center/gdaui-dsn-assistant.c:619
msgid "New database definition"
msgstr "新数据库定义"
-#: ../control-center/gdaui-dsn-assistant.c:595
-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."
-msgstr ""
-"以下字段描述了打开一个连接时所需的信息(必填字段标有星号)。该信息是针对特定数"
-"据库的，所以请查阅手册了解详细信息。"
-
-#. connection's spec
-#: ../control-center/gdaui-dsn-assistant.c:608
-#: ../control-center/gdaui-dsn-editor.c:202
+#: ../control-center/gdaui-dsn-assistant.c:642
msgid "Connection's parameters"
msgstr "连接参数"
-#: ../control-center/gdaui-dsn-assistant.c:620
+#: ../control-center/gdaui-dsn-assistant.c:654
msgid ""
"The following fields represent the authentication information needed to open "
"a connection."
msgstr "以下字段描述了打开一个连接所需的认证信息。"
-#: ../control-center/gdaui-dsn-assistant.c:631
+#: ../control-center/gdaui-dsn-assistant.c:665
+#: ../control-center/provider-config.c:106
msgid "Authentication parameters"
msgstr "认证参数"
-#: ../control-center/gdaui-dsn-assistant.c:643
+#: ../control-center/gdaui-dsn-assistant.c:677
msgid ""
"All information needed to create a new data source has been retrieved. Now, "
"press 'Apply' to close this dialog."
-msgstr "创建新数据源所需要的所有信息都已经检索。现在点击“应用”来关闭这个对话框"
+msgstr ""
+"创建新数据源所需要的所有信息都已经收集完毕。现在点击“应用”来关闭这个对话框。"
-#: ../control-center/gdaui-dsn-assistant.c:652
+#: ../control-center/gdaui-dsn-assistant.c:686
msgid "Ready to add a new data source"
msgstr "准备好添加新数据源"
-#: ../control-center/gdaui-dsn-editor.c:129
-msgid "Data source _name:"
-msgstr "数据源名称(_N)："
-
-#: ../control-center/gdaui-dsn-editor.c:151
+#: ../control-center/gdaui-dsn-editor.c:221
msgid "_System wide data source:"
msgstr "全系统数据源(_S)："
-#: ../control-center/gdaui-dsn-editor.c:162
+#: ../control-center/gdaui-dsn-editor.c:233
msgid "_Provider:"
msgstr "提供者(_P)"
-#: ../control-center/gdaui-dsn-editor.c:178
+#: ../control-center/gdaui-dsn-editor.c:250
msgid "_Description:"
msgstr "描述(_D)"
-#: ../control-center/gdaui-dsn-editor.c:194
+#: ../control-center/gdaui-dsn-editor.c:271
msgid ""
"<span foreground='red'>The database provider used by this data source is not "
"available,\n"
@@ -367,16 +380,65 @@ msgstr ""
"<span foreground='red'>此数据源使用的数据库提供者不可用，数据源的编辑属性已被"
"禁用</span>"
-#. connection's authentication
-#: ../control-center/gdaui-dsn-editor.c:216 ../libgda/gda-config.c:1646
-#: ../tools/browser/auth-dialog.c:283 ../tools/config-info.c:205
-#: ../tools/config-info.c:365
-msgid "Authentication"
-msgstr "认证"
+#: ../control-center/gdaui-dsn-editor.c:320
+#, c-format
+msgid "Login for %s"
+msgstr "登录为 %s"
+
+#: ../control-center/gdaui-dsn-editor.c:345
+msgid "Connection successfully opened!"
+msgstr "连接成功打开！"
+
+#: ../control-center/gdaui-dsn-editor.c:353
+msgid "Could not open connection"
+msgstr "无法打开连接"
+
+#: ../control-center/gdaui-dsn-editor.c:404
+msgid "Data source copy"
+msgstr "数据源拷贝"
+
+#: ../control-center/gdaui-dsn-editor.c:406
+msgid "Create data source"
+msgstr "创建数据源"
+
+#: ../control-center/gdaui-dsn-editor.c:407
+#: ../control-center/gdaui-login-dialog.c:105
+#: ../libgda-ui/data-entries/common-bin.c:62
+#: ../libgda-ui/data-entries/common-bin.c:162
+#: ../libgda-ui/data-entries/plugins/common-pict.c:328
+#: ../libgda-ui/data-entries/plugins/common-pict.c:437
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:200
+#: ../libgda-ui/gdaui-basic-form.c:2116 ../libgda-ui/gdaui-raw-grid.c:1733
+#: ../libgda-ui/gdaui-raw-grid.c:2087 ../libgda-ui/gdaui-rt-editor.c:685
+#: ../libgda-ui/gdaui-server-operation.c:1075
+#: ../tools/browser/auth-dialog.c:193
+#: ../tools/browser/canvas/browser-canvas.c:469
+#: ../tools/browser/connection-binding-properties.c:171
+#: ../tools/browser/connection-binding-properties.c:207
+#: ../tools/browser/fk-declare.c:129 ../tools/browser/gdaui-entry-import.c:186
+#: ../tools/browser/ldap-browser/entry-properties.c:226
+#: ../tools/browser/ldap-browser/vtable-dialog.c:158
+#: ../tools/browser/login-dialog.c:113
+#: ../tools/browser/query-exec/query-console-page.c:889
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../control-center/gdaui-dsn-editor.c:421
+#, c-format
+msgid ""
+"Define the name of the new data source which will be created as a copy of "
+"'%s':"
+msgstr "新数据源的名称的定义将用“%s”的副本创建:"
+
+#: ../control-center/gdaui-dsn-editor.c:472
+#, fuzzy, c-format
+#| msgid "Could not declare new data source"
+msgid "Could not create data source: %s"
+msgstr "无法创建新数据源:%s"
#: ../control-center/gdaui-login-dialog.c:76
-#: ../control-center/gdaui-login-dialog.c:84
-#: ../tools/browser/auth-dialog.c:229 ../tools/browser/login-dialog.c:189
+#: ../control-center/gdaui-login-dialog.c:84 ../tools/browser/auth-dialog.c:214
+#: ../tools/browser/login-dialog.c:184
msgid "Connection opening"
msgstr "连接正在打开"
@@ -394,201 +456,180 @@ msgstr ""
"没有认证要求，\n"
"确认打开了连接"
-#: ../control-center/main.c:53 ../libgda-ui/internal/utility.c:482
-#: ../tools/browser/support.c:152
-msgid "Error:"
-msgstr "错误："
+#: ../control-center/gdaui-login-dialog.c:106
+#: ../tools/browser/auth-dialog.c:192 ../tools/browser/login-dialog.c:112
+msgid "C_onnect"
+msgstr "连接(_O)"
-#: ../control-center/main.c:79
+#: ../control-center/main.c:48
msgid "Could not declare new data source"
msgstr "无法声明新数据源"
-#: ../control-center/main.c:82
+#: ../control-center/main.c:51
msgid "No valid data source info was created"
msgstr "没有已创建的可以数据源信息"
-#: ../control-center/main.c:180 ../tools/browser/browser-window.c:1256
+#: ../control-center/main.c:161
+#, fuzzy
+#| msgid "Database access control center"
+msgid "Database sources control center"
+msgstr "数据库访问控制中心"
+
+#: ../control-center/main.c:164
msgid "Database access services for the GNOME Desktop"
msgstr "GNOME 桌面的数据库访问服务"
-#: ../control-center/main.c:196
-msgid "_Data source"
-msgstr "数据源(_D)"
-
-#: ../control-center/main.c:196
-msgid "Database"
-msgstr "数据库"
-
-#: ../control-center/main.c:197 ../tools/browser/browser-window.c:296
-#: ../tools/browser/common/ui-formgrid.c:694
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: ../control-center/main.c:197 ../tools/browser/browser-window.c:296
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: ../control-center/main.c:198
-msgid "_New datasource"
-msgstr "新建数据源(_N)"
-
-#: ../control-center/main.c:198
-msgid "Create new data source"
-msgstr "创建一个新的数据源"
-
-#: ../control-center/main.c:199
-msgid "_Delete datasource"
-msgstr "删除数据源(_D)"
-
-#: ../control-center/main.c:199
-msgid "Delete selected data source"
-msgstr "删除选中的数据源"
-
-#: ../control-center/main.c:200 ../tools/browser/browser-window.c:285
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: ../control-center/main.c:200
-msgid "Edit properties for selected data source"
-msgstr "编辑选中的数据源的属性"
+#: ../control-center/main.c:232
+#, fuzzy
+#| msgid "Database access control center"
+msgid "Datasource access control center"
+msgstr "数据库访问控制中心"
-#: ../control-center/main.c:201 ../control-center/main.c:202
-#: ../tools/browser/browser-window.c:298
-msgid "_About"
-msgstr "关于(_A)"
+#: ../control-center/provider-config.c:73
+#, fuzzy
+#| msgid "Connection's parameters"
+msgid "Accepted connection parameters"
+msgstr "连接参数"
-#: ../control-center/main.c:201 ../tools/browser/browser-window.c:298
-msgid "About"
-msgstr "关于"
+#: ../control-center/provider-config.c:94
+#: ../control-center/provider-config.c:97
+#: ../control-center/provider-config.c:127
+#: ../control-center/provider-config.c:130
+msgid "optional"
+msgstr "可选"
-#: ../control-center/main.c:202
-msgid "About GNOME-DB"
-msgstr "关于 GNOME-DB"
+#: ../control-center/provider-config.c:137
+msgid "Shared object file"
+msgstr "共享目标文件"
#. title
-#: ../control-center/main.c:390 ../control-center/provider-config.c:60
+#: ../control-center/provider-config.c:173
msgid "Providers"
msgstr "提供者"
-#: ../control-center/provider-config.c:61
-msgid "Installed providers"
-msgstr "已安装的提供者"
-
-#: ../control-center/provider-config.c:99
+#: ../control-center/provider-config.c:174
msgid ""
"Providers are addons that actually implement the access to each database "
"using the means provided by each database vendor."
msgstr "提供者是实际实现使用每个数据制造商提供的方法访问每种数据库的附加组件。"
-#: ../libgda/gda-batch.c:321
+#: ../libgda/gda-batch.c:270
msgid "Statement could not be found in batch's statements"
msgstr "在批处理声明中没有找到该声明"
-#: ../libgda/gda-batch.c:446
+#: ../libgda/gda-batch.c:396
#, c-format
msgid "Conflicting parameter '%s'"
msgstr "冲突的参数 '%s'"
-#: ../libgda/gda-config.c:382 ../libgda/gda-config.c:408
-#: ../libgda/gda-config.c:532 ../libgda/gda-config.c:557
+#: ../libgda/gda-config.c:524 ../libgda/gda-config.c:550
+#: ../libgda/gda-config.c:675 ../libgda/gda-config.c:700
#, c-format
msgid "Error loading authentication information for '%s' DSN: %s"
msgstr "载入“%s” DSN 的认证信息出错：%s"
-#: ../libgda/gda-config.c:718
+#: ../libgda/gda-config.c:863
#, c-format
msgid "Error creating user specific configuration directory '%s'"
msgstr "创建用户特定的配置目录 %s 出错"
-#: ../libgda/gda-config.c:767 ../libgda/gda-config.c:780
+#: ../libgda/gda-config.c:912 ../libgda/gda-config.c:925
#, c-format
msgid ""
"User specific configuration directory '%s' exists and is not a directory"
msgstr "用户特定的配置目录 '%s' 存在但不是一个目录"
-#: ../libgda/gda-config.c:1042
+#: ../libgda/gda-config.c:1158
#, c-format
msgid "Malformed data source name '%s'"
msgstr "格式错误的数据源名称 '%s'"
-#: ../libgda/gda-config.c:1067 ../libgda/gda-config.c:1079
-#: ../libgda/gda-config.c:1177
+#: ../libgda/gda-config.c:1184 ../libgda/gda-config.c:1196
+#: ../libgda/gda-config.c:1295
#, c-format
msgid "Couldn't save authentication information for DSN '%s': %s"
msgstr "无法保存 DSN %s 的认证信息：%s"
-#: ../libgda/gda-config.c:1112 ../libgda/gda-config.c:1287
+#: ../libgda/gda-config.c:1230 ../libgda/gda-config.c:1406
msgid "Can't manage system-wide configuration"
msgstr "无法管理全系统配置"
-#: ../libgda/gda-config.c:1167 ../libgda/gda-config.c:1199
-#, c-format
-msgid "Authentication for the '%s' DSN"
+#: ../libgda/gda-config.c:1285 ../libgda/gda-config.c:1317
+#, fuzzy, c-format
+#| msgid "Authentication for the '%s' DSN"
+msgid "Gnome-DB: authentication for the '%s' DSN"
msgstr "“%s” DSN 认证"
-#: ../libgda/gda-config.c:1236 ../libgda/gda-config.c:1248
-#: ../libgda/gda-config.c:1312
+#: ../libgda/gda-config.c:1354 ../libgda/gda-config.c:1366
+#: ../libgda/gda-config.c:1430
#, c-format
msgid "Couldn't delete authentication information for DSN '%s': %s"
msgstr "无法删除 DSN %s 的认证信息：%s"
-#: ../libgda/gda-config.c:1281 ../libgda-ui/gdaui-login.c:665
+#: ../libgda/gda-config.c:1400 ../libgda-ui/gdaui-login.c:640
#, c-format
msgid "Unknown DSN '%s'"
msgstr "未知的的 DSN '%s'"
-#: ../libgda/gda-config.c:1376
+#: ../libgda/gda-config.c:1495
#, c-format
msgid "Provider '%s' not found"
msgstr "提供者 '%s' 未找到"
-#: ../libgda/gda-config.c:1561 ../libgda/gda-connection.c:965
-#: ../libgda/gda-connection.c:1114
+#: ../libgda/gda-config.c:1685 ../libgda/gda-connection.c:988
+#: ../libgda/gda-connection.c:1060 ../libgda/gda-connection.c:1241
#, c-format
msgid "No provider '%s' installed"
msgstr "没有安装的 '%s' 提供者"
-#: ../libgda/gda-config.c:1576
+#: ../libgda/gda-config.c:1699
#, c-format
msgid "Can't load provider: %s"
msgstr "无法加载提供者：%s"
-#: ../libgda/gda-config.c:1599
+#: ../libgda/gda-config.c:1720
#, c-format
msgid "Can't instantiate provider '%s'"
msgstr "无法实例化提供者 '%s'"
-#: ../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:2634 ../tools/gda-sql.c:2978
+#: ../libgda/gda-config.c:1765 ../libgda/gda-data-model-dsn-list.c:105
+#: ../libgda/gda-data-model-dsn-list.c:106 ../tools/common/t-app.c:2534
+#: ../tools/common/t-app.c:2902 ../tools/common/t-config-info.c:71
+#: ../tools/common/t-config-info.c:132 ../tools/common/t-config-info.c:315
+#: ../tools/common/t-config-info.c:429
msgid "Provider"
msgstr "提供者"
-#: ../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:2633 ../tools/gda-sql.c:3276
+#: ../libgda/gda-config.c:1766 ../libgda/gda-data-model-dsn-list.c:111
+#: ../libgda/gda-data-model-dsn-list.c:112
+#: ../tools/browser/data-manager/data-source-editor.c:167
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:304
+#: ../tools/common/t-app.c:2257 ../tools/common/t-app.c:2328
+#: ../tools/common/t-app.c:2533 ../tools/common/t-config-info.c:72
+#: ../tools/common/t-config-info.c:146 ../tools/common/t-config-info.c:329
msgid "Description"
msgstr "描述"
-#: ../libgda/gda-config.c:1645 ../tools/config-info.c:158
+#: ../libgda/gda-config.c:1767 ../tools/common/t-config-info.c:160
msgid "DSN parameters"
msgstr "DSN 参数"
-#: ../libgda/gda-config.c:1647 ../tools/config-info.c:244
+#: ../libgda/gda-config.c:1769 ../tools/common/t-config-info.c:246
msgid "File"
msgstr "文件"
-#: ../libgda/gda-config.c:1648
+#: ../libgda/gda-config.c:1770
msgid "List of installed providers"
msgstr "已安装的提供者"
-#: ../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:2980
+#: ../libgda/gda-config.c:1869
+#, c-format
+msgid "No default SQLite Provider Trying to create a new one. Error was: %s"
+msgstr "SQLite 提供者未定义，尝试创建出错。 错误：%s"
+
+#: ../libgda/gda-config.c:1953 ../libgda/gda-data-model-dsn-list.c:125
+#: ../libgda/gda-data-model-dsn-list.c:126
+#: ../providers/ldap/ldap_specs_auth.xml.in.h:1 ../tools/common/t-app.c:2904
msgid "Username"
msgstr "用户名"
@@ -597,7 +638,7 @@ msgstr "用户名"
#. This file contains the CREATE ROLE operation's parameters, which is
#. available since PostgreSQL 8.1
#.
-#: ../libgda/gda-config.c:1823 ../providers/ldap/ldap_specs_auth.xml.in.h:3
+#: ../libgda/gda-config.c:1955 ../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
@@ -605,29 +646,29 @@ msgstr "用户名"
msgid "Password"
msgstr "口令"
-#: ../libgda/gda-config.c:1893
+#: ../libgda/gda-config.c:2035
#, c-format
msgid "Error loading provider '%s': %s"
msgstr "加载提供者 '%s' 参数：%s"
-#: ../libgda/gda-connection.c:304
+#: ../libgda/gda-connection.c:325
msgid "DSN to use"
msgstr "要使用的 DSN"
-#: ../libgda/gda-connection.c:307
+#: ../libgda/gda-connection.c:328
msgid "Connection string to use"
msgstr "要使用的连接字符串"
-#: ../libgda/gda-connection.c:310
+#: ../libgda/gda-connection.c:331
msgid "Provider to use"
msgstr "要使用的提供者"
-#: ../libgda/gda-connection.c:315
+#: ../libgda/gda-connection.c:336
msgid "Authentication string to use"
msgstr "要使用的认证字符串"
-#: ../libgda/gda-connection.c:319 ../libgda-ui/data/server_operation.glade.h:6
-#: ../libgda-ui/gdaui-server-operation.c:778
+#: ../libgda/gda-connection.c:340 ../libgda-ui/data/server_operation.xml.h:5
+#: ../libgda-ui/gdaui-server-operation.c:754
#: ../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
@@ -635,693 +676,783 @@ msgid "Options"
msgstr "选项"
#. To translators: Don't translate "GdaMetaStore", it's a class name
-#: ../libgda/gda-connection.c:324
+#: ../libgda/gda-connection.c:345
msgid "GdaMetaStore used by the connection"
msgstr "连接使用的 GdaMetaStore"
-#: ../libgda/gda-connection.c:338
+#: ../libgda/gda-connection.c:359
msgid "Number of history events to keep in memory"
msgstr "内存中保留的最大历史事件数"
-#: ../libgda/gda-connection.c:351
+#: ../libgda/gda-connection.c:372
msgid "Computes execution delay for each executed statement"
msgstr "计算每条执行语句的执行延迟"
-#: ../libgda/gda-connection.c:365
+#: ../libgda/gda-connection.c:388
msgid "Artificially slows down the execution of queries"
msgstr "人为减慢查询执行"
-#: ../libgda/gda-connection.c:602 ../libgda/gda-connection.c:630
-#: ../libgda/gda-connection.c:644 ../libgda/gda-connection.c:659
+#: ../libgda/gda-connection.c:586 ../libgda/gda-connection.c:614
+#: ../libgda/gda-connection.c:628 ../libgda/gda-connection.c:643
#, c-format
-#| msgid "Can't set the '%s' property once the connection is opened"
msgid "Can't set the '%s' property when the connection is opened"
msgstr "连接打开时无法设置 “%s”属性"
-#: ../libgda/gda-connection.c:610
+#: ../libgda/gda-connection.c:594
#, c-format
msgid "No DSN named '%s' defined"
msgstr "没有定义名为 '%s' 的 DSN"
-#: ../libgda/gda-connection.c:680
+#: ../libgda/gda-connection.c:664
#, c-format
msgid "Can't set the '%s' property once the connection is opened"
msgstr "连接打开时无法设置 “%s”属性"
-#: ../libgda/gda-connection.c:927
+#: ../libgda/gda-connection.c:950
#, c-format
msgid "Malformed data source specification '%s'"
msgstr "格式错误的数据源规范 '%s'"
-#: ../libgda/gda-connection.c:935 ../libgda/gda-connection.c:1283
-#: ../libgda/gda-connection.c:1285
+#: ../libgda/gda-connection.c:958 ../libgda/gda-connection.c:1412
+#: ../libgda/gda-connection.c:1414
#, c-format
msgid "Data source %s not found in configuration"
msgstr "无法在配置中找到数据源 %s"
-#: ../libgda/gda-connection.c:974
+#: ../libgda/gda-connection.c:997 ../libgda/gda-connection.c:1069
msgid "Datasource configuration error: no provider specified"
msgstr "数据源配置错误：没有指定提供者"
-#: ../libgda/gda-connection.c:1077 ../tools/browser/auth-dialog.c:434
-#: ../tools/browser/auth-dialog.c:469 ../tools/gda-sql.c:1264
+#: ../libgda/gda-connection.c:1204 ../tools/browser/auth-dialog.c:384
+#: ../tools/browser/auth-dialog.c:419 ../tools/common/t-connection.c:779
#, c-format
msgid "Malformed connection string '%s'"
msgstr "无效的连接字符串 '%s'"
-#: ../libgda/gda-connection.c:1083
+#: ../libgda/gda-connection.c:1210
msgid "No database driver specified"
msgstr "没有指定数据库驱动"
-#: ../libgda/gda-connection.c:1273
+#: ../libgda/gda-connection.c:1402
msgid "No provider specified"
msgstr "没有指定的提供者"
-#: ../libgda/gda-connection.c:1295 ../libgda/gda-connection.c:1297
+#: ../libgda/gda-connection.c:1424 ../libgda/gda-connection.c:1426
msgid "No DSN or connection string specified"
msgstr "没有指定 DSN 或连接字符串"
-#: ../libgda/gda-connection.c:1391
-#| msgid "Connection not yet opened"
-msgid "Connection is alreay opened"
+#: ../libgda/gda-connection.c:1522
+msgid "Connection is already opened"
msgstr "连接已打开"
-#: ../libgda/gda-connection.c:1413
+#: ../libgda/gda-connection.c:1545
#, c-format
msgid "Error while maintaining the meta data up to date: %s"
msgstr "维持元数据为最新时出错：%s"
-#: ../libgda/gda-connection.c:1680
+#: ../libgda/gda-connection.c:1947
msgid "Provider does not provide a GdaDataHandler for dates"
msgstr "提供者没有为日期提供一个 GdaDataHandler"
-#: ../libgda/gda-connection.c:2824 ../libgda/gda-connection.c:3186
-#: ../libgda/gda-connection.c:3282 ../libgda/gda-connection.c:3372
-#: ../libgda/gda-connection.c:5660
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:170
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:419
+#: ../libgda/gda-connection.c:2119 ../libgda/gda-connection.c:2189
+#: ../libgda/gda-connection.c:2340 ../libgda/gda-connection.c:2414
+#: ../libgda/gda-connection.c:2597 ../libgda/gda-connection.c:3044
+#: ../libgda/gda-connection.c:3258 ../libgda/gda-connection.c:3610
+#: ../libgda/gda-connection.c:3631 ../libgda/gda-connection.c:3715
+#: ../libgda/gda-connection.c:3727 ../libgda/gda-connection.c:3802
+#: ../libgda/gda-connection.c:3817 ../libgda/gda-connection.c:3904
+#: ../libgda/gda-connection.c:3932 ../libgda/gda-connection.c:3961
+#: ../libgda/gda-connection.c:3987 ../libgda/gda-connection.c:4013
+#: ../libgda/gda-connection.c:4039 ../libgda/gda-connection.c:5078
+#: ../libgda/gda-connection.c:5323 ../libgda/gda-connection.c:5396
+#: ../libgda/gda-connection.c:6285
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:383
#, c-format
msgid "Connection is closed"
msgstr "连接已关闭"
-#: ../libgda/gda-connection.c:3058 ../libgda/gda-connection.c:3073
+#: ../libgda/gda-connection.c:3495 ../libgda/gda-connection.c:3510
msgid "Statement is a selection statement"
msgstr "语句是一条选择语句"
-#: ../libgda/gda-connection.c:3129 ../libgda/gda-connection.c:3228
-#: ../libgda/gda-connection.c:3317
+#: ../libgda/gda-connection.c:3567 ../libgda/gda-connection.c:3667
+#: ../libgda/gda-connection.c:3756
msgid "Statement is not a selection statement"
msgstr "语句不是一条选择语句"
-#: ../libgda/gda-connection.c:3754
+#: ../libgda/gda-connection.c:4216
msgid "Invalid argument"
msgstr "无效参数"
-#: ../libgda/gda-connection.c:3764
+#: ../libgda/gda-connection.c:4226
#, c-format
msgid "Missing or wrong arguments for table '%s': %s"
msgstr "表 '%s' 丢失或有错误的参数：%s"
-#: ../libgda/gda-connection.c:4430
-msgid "Meta update error"
-msgstr "元数据更新错误"
+#: ../libgda/gda-connection.c:5346
+#, fuzzy, c-format
+#| msgid "Error while fetching meta data from the connection: %s"
+msgid "While extracting data from Data Store: %s"
+msgstr "从连接中获取元数据出错：%s"
+
+#: ../libgda/gda-connection.c:5404
+#, fuzzy, c-format
+#| msgid "Internal SQLite error: no data to iterate on"
+msgid "Internal error: No meta store in connection"
+msgstr "内部 SQLite 错误：无可迭代的数据"
+
+#: ../libgda/gda-connection.c:5422
+#, c-format
+msgid "Parameter 'name' is required to filter namespaces"
+msgstr "筛选命名空间参数 'name' 未指定"
+
+#: ../libgda/gda-connection.c:5433
+#, c-format
+msgid "Parameter 'name' is required to filter data types"
+msgstr "筛选数据类型参数 'name' 未指定"
+
+#: ../libgda/gda-connection.c:5444
+#, c-format
+msgid "Parameter 'name' is required to filter tables"
+msgstr "筛选表参数 'name' 未指定"
+
+#: ../libgda/gda-connection.c:5455
+#, c-format
+msgid "Parameter 'name' is required to filter views"
+msgstr "筛选视图参数 'name' 未指定"
+
+#: ../libgda/gda-connection.c:5465
+#, c-format
+msgid "Parameter 'name' is required to filter fields"
+msgstr "筛选字段参数 'name' 未指定"
+
+#: ../libgda/gda-connection.c:5471
+#, c-format
+msgid "Parameter 'field_name' is required to filter fields"
+msgstr "筛选字段参数 'field_name' 未指定"
+
+#: ../libgda/gda-connection.c:5478
+#, c-format
+msgid "Parameters: 'name' and/or 'field_name' are required to filter fields"
+msgstr ""
+
+#: ../libgda/gda-connection.c:5487 ../libgda/gda-connection.c:5508
+#, c-format
+msgid "Parameter 'name' is required to filter indexes"
+msgstr "筛选索引参数 'name' 未指定"
+
+#: ../libgda/gda-connection.c:5493 ../libgda/gda-connection.c:5512
+#, c-format
+msgid "Parameter 'index_name' is required to filter indexes"
+msgstr "筛选索引参数 'index_name' 未指定"
+
+#: ../libgda/gda-connection.c:5500
+#, c-format
+msgid "Parameters: 'name' and/or 'index_name' are required to filter indexes"
+msgstr ""
+
+#: ../libgda/gda-connection.c:5520
+#, c-format
+msgid "Invalid meta type to get data from store"
+msgstr ""
-#: ../libgda/gda-connection.c:4964
-msgid "Wrong filter arguments"
-msgstr "错误的过滤器参数"
+#: ../libgda/gda-connection.c:5531
+#, fuzzy, c-format
+#| msgid ""
+#| "Internal error while building INSERT statement:\n"
+#| "%s"
+msgid "Internal error while creating statement to retrieve data: %s"
+msgstr ""
+"在生成 INSERT 语句时发生内部错误：\n"
+"%s"
-#: ../libgda/gda-connection.c:5152 ../libgda/gda-connection.c:5205
-#: ../libgda/gda-connection.c:5249 ../libgda/gda-connection.c:5293
-#: ../libgda/gda-connection.c:5337
+#: ../libgda/gda-connection.c:5723 ../libgda/gda-connection.c:5777
+#: ../libgda/gda-connection.c:5822 ../libgda/gda-connection.c:5867
+#: ../libgda/gda-connection.c:5912
#, 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: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:1123
-#: ../libgda/gda-data-proxy.c:3561 ../libgda/gda-data-proxy.c:3685
-#: ../libgda/gda-data-select.c:1341 ../libgda/gda-data-select.c:1925
-#: ../libgda/gda-data-select.c:2881 ../libgda/gda-data-select.c:2948
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:932
-#: ../libgda-ui/gdaui-combo.c:825
+#: ../libgda/gda-connection.c:7045
+msgid "Unspecified table name"
+msgstr "未指定的表名"
+
+#: ../libgda/gda-connection.c:7087
+msgid "Invalid type"
+msgstr "无效类型"
+
+#: ../libgda/gda-connection.c:7183
+msgid "CREATE TABLE operation is not supported by the database server"
+msgstr "数据库服务器不支持 CREATE TABLE 操作"
+
+#: ../libgda/gda-connection.c:7302 ../libgda/gda-connection.c:7312
+#, c-format
+msgid "Wrong SQL identifier value"
+msgstr "错误的 SQL 标识符值"
+
+#: ../libgda/gda-data-access-wrapper.c:578
+#: ../libgda/gda-data-meta-wrapper.c:514 ../libgda/gda-data-model-array.c:397
+#: ../libgda/gda-data-model-array.c:636 ../libgda/gda-data-model-bdb.c:655
+#: ../libgda/gda-data-model-bdb.c:757 ../libgda/gda-data-model-bdb.c:786
+#: ../libgda/gda-data-model-dir.c:719 ../libgda/gda-data-model-dir.c:816
+#: ../libgda/gda-data-model-dir.c:857 ../libgda/gda-data-model-dsn-list.c:269
+#: ../libgda/gda-data-model-iter.c:414 ../libgda/gda-data-model-iter.c:1133
+#: ../libgda/gda-data-proxy.c:3538 ../libgda/gda-data-proxy.c:3662
+#: ../libgda/gda-data-select.c:1341 ../libgda/gda-data-select.c:1921
+#: ../libgda/gda-data-select.c:2923
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:931
+#: ../libgda-ui/gdaui-combo.c:777
#, c-format
msgid "Column %d out of range (0-%d)"
msgstr "列 %d 超出范围 (0-%d)"
-#: ../libgda/gda-data-access-wrapper.c:676
+#: ../libgda/gda-data-access-wrapper.c:618
msgid "Can't set iterator's position"
msgstr "无法设置迭代器的位置"
-#: ../libgda/gda-data-access-wrapper.c:754
+#: ../libgda/gda-data-access-wrapper.c:696
msgid "Can't access data"
msgstr "无法访问数据"
-#: ../libgda/gda-data-comparator.c:163
+#: ../libgda/gda-data-comparator.c:131
msgid "Old data model"
msgstr "旧数据模型"
-#: ../libgda/gda-data-comparator.c:167
+#: ../libgda/gda-data-comparator.c:135
msgid "New data model"
msgstr "旧数据模型"
-#: ../libgda/gda-data-comparator.c:450
+#: ../libgda/gda-data-comparator.c:402
msgid "Missing original data model"
msgstr "丢失原本的数据模型"
-#: ../libgda/gda-data-comparator.c:455
+#: ../libgda/gda-data-comparator.c:407
msgid "Missing new data model"
msgstr "丢失新数据模型"
-#: ../libgda/gda-data-comparator.c:461
+#: ../libgda/gda-data-comparator.c:413
msgid "Data models must support random access model"
msgstr "数据模型必须支持随机访问模型"
-#: ../libgda/gda-data-comparator.c:470
+#: ../libgda/gda-data-comparator.c:422
msgid "Data models to compare don't have the same number of columns"
msgstr "要比较的数据模型的列数不同"
-#: ../libgda/gda-data-comparator.c:481
+#: ../libgda/gda-data-comparator.c:433
#, c-format
msgid "Type mismatch for column %d: '%s' and '%s'"
msgstr "列 %d 类型不匹配：'%s' 和 '%s'"
-#: ../libgda/gda-data-comparator.c:492
+#: ../libgda/gda-data-comparator.c:444
msgid "Can't get the number of rows of data model to compare from"
msgstr "无法获得作为比较来源的数据模型的行数"
-#: ../libgda/gda-data-comparator.c:498
+#: ../libgda/gda-data-comparator.c:450
msgid "Can't get the number of rows of data model to compare to"
msgstr "无法获得作为比较目标的数据模型的行数"
-#: ../libgda/gda-data-comparator.c:583 ../libgda/gda-data-comparator.c:619
+#: ../libgda/gda-data-comparator.c:535 ../libgda/gda-data-comparator.c:571
msgid "Differences computation cancelled on signal handling"
msgstr "信号处理时取消了差异估算"
-#: ../libgda/gda-data-model-array.c:180
+#: ../libgda/gda-data-model-array.c:141
msgid "Whether data model can be modified"
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:3634
-#: ../libgda/gda-data-proxy.c:3672 ../libgda/gda-data-select.c:1874
-#: ../libgda/gda-data-select.c:1935
+#: ../libgda/gda-data-model-array.c:468 ../libgda/gda-data-model-array.c:627
+#: ../libgda/gda-data-model-array.c:717 ../libgda/gda-data-model-dir.c:730
+#: ../libgda/gda-data-model-dir.c:901 ../libgda/gda-data-model-dir.c:1267
+#: ../libgda/gda-data-model-dsn-list.c:277 ../libgda/gda-data-proxy.c:3611
+#: ../libgda/gda-data-proxy.c:3649 ../libgda/gda-data-select.c:1868
+#: ../libgda/gda-data-select.c:1931
#, c-format
msgid "Row %d out of range (0-%d)"
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:3637
-#: ../libgda/gda-data-proxy.c:3675 ../libgda/gda-data-select.c:1877
-#: ../libgda/gda-data-select.c:1938
+#: ../libgda/gda-data-model-array.c:472 ../libgda/gda-data-model-array.c:630
+#: ../libgda/gda-data-model-array.c:720 ../libgda/gda-data-model-dir.c:733
+#: ../libgda/gda-data-model-dir.c:904 ../libgda/gda-data-model-dir.c:1270
+#: ../libgda/gda-data-model-dsn-list.c:280 ../libgda/gda-data-proxy.c:3614
+#: ../libgda/gda-data-proxy.c:3652 ../libgda/gda-data-select.c:1871
+#: ../libgda/gda-data-select.c:1934
#, c-format
msgid "Row %d not found (empty data model)"
msgstr "行 %d 未找到 (空数据模型)"
-#: ../libgda/gda-data-model-array.c:654
+#: ../libgda/gda-data-model-array.c:620
msgid "No row in data model"
msgstr "数据模型中没有行"
-#: ../libgda/gda-data-model-array.c:686
+#: ../libgda/gda-data-model-array.c:652
msgid "Data model has no data"
msgstr "数据模型没有数据"
-#: ../libgda/gda-data-model-array.c:741 ../libgda/gda-data-model-array.c:785
-#: ../libgda/gda-data-model-array.c:824 ../libgda/gda-data-model-array.c:859
+#: ../libgda/gda-data-model-array.c:710 ../libgda/gda-data-model-array.c:755
+#: ../libgda/gda-data-model-array.c:795 ../libgda/gda-data-model-array.c:831
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:864
+#: ../libgda/gda-data-model-array.c:761 ../libgda/gda-data-model-array.c:801
+#: ../libgda/gda-data-model.c:789
msgid "Too many values in list"
msgstr "列表中的值太多"
-#: ../libgda/gda-data-model-array.c:884
+#: ../libgda/gda-data-model-array.c:856
msgid "Row not found in data model"
msgstr "数据模型中没有找到行"
-#: ../libgda/gda-data-model-bdb.c:262
+#: ../libgda/gda-data-model-bdb.c:260
#, c-format
msgid "Could not load the Berkeley DB library: %s"
msgstr "无法加载 Berkeley DB 库：%s"
-#: ../libgda/gda-data-model-bdb.c:266 ../libgda/gda-data-model-bdb.c:270
+#: ../libgda/gda-data-model-bdb.c:264 ../libgda/gda-data-model-bdb.c:268
#, c-format
msgid "Could not load the '%s' symbol from the Berkeley DB library"
msgstr "无法从 Berkeley DB 库加载 '%s' 符号"
-#: ../libgda/gda-data-model-bdb.c:293 ../libgda/gda-data-model-bdb.c:367
+#: ../libgda/gda-data-model-bdb.c:291 ../libgda/gda-data-model-bdb.c:365
msgid "Berkeley DB library not loaded"
msgstr "Berkeley DB 库未加载"
-#: ../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
+#: ../libgda/gda-data-model-bdb.c:693 ../libgda/gda-data-model-bdb.c:725
+#: ../libgda/gda-data-model-bdb.c:830 ../libgda/gda-data-model-bdb.c:921
#, c-format
msgid ""
"Custom BDB model implementation is not complete: the '%s' method is missing"
msgstr "自定义 BDB 模型实现不完整：丢失 '%s' 方法"
-#: ../libgda/gda-data-model-bdb.c:862 ../libgda/gda-data-model-bdb.c:952
+#: ../libgda/gda-data-model-bdb.c:858 ../libgda/gda-data-model-bdb.c:948
#, c-format
msgid "Expected GdaBinary value, got %s"
msgstr "期望 GdaBinary 值，但是获得了 %s"
-#: ../libgda/gda-data-model-bdb.c:908
+#: ../libgda/gda-data-model-bdb.c:904
msgid "Key modification is not supported"
msgstr "键修改不受支持"
-#: ../libgda/gda-data-model.c:705
+#: ../libgda/gda-data-model.c:636
msgid "Data model does not support getting individual value"
msgstr "数据模型不支持获取个体值"
-#: ../libgda/gda-data-model.c:748 ../libgda/gda-data-model.c:758
+#: ../libgda/gda-data-model.c:679 ../libgda/gda-data-model.c:689
#, c-format
msgid "Data model returned value of invalid '%s' type"
msgstr "数据模型返回了无效类型 '%s' 的值"
-#: ../libgda/gda-data-model.c:755
+#: ../libgda/gda-data-model.c:686
msgid "Data model returned invalid NULL value"
msgstr "数据模型返回无效的 NULL 值"
-#: ../libgda/gda-data-model.c:825
+#: ../libgda/gda-data-model.c:752
msgid "Data model does not support setting individual value"
msgstr "数据模型不支持设置个体值"
-#: ../libgda/gda-data-model.c:883
+#: ../libgda/gda-data-model.c:808
msgid "Data model does not support setting values"
msgstr "数据模型不支持设置值"
-#: ../libgda/gda-data-model.c:1047 ../libgda/gda-data-model.c:1083
+#: ../libgda/gda-data-model.c:885 ../libgda/gda-data-model.c:919
msgid "Data model does not support row append"
msgstr "数据模型不支持行追加"
-#: ../libgda/gda-data-model.c:1074
+#: ../libgda/gda-data-model.c:910
msgid "Model does not allow row insertion"
msgstr "模型不允许行插入"
-#: ../libgda/gda-data-model.c:1111
+#: ../libgda/gda-data-model.c:945
msgid "Model does not allow row deletion"
msgstr "模型不支持行删除"
-#: ../libgda/gda-data-model.c:1120
+#: ../libgda/gda-data-model.c:954
msgid "Data model does not support row removal"
msgstr "数据模型不支持删除行"
-#: ../libgda/gda-data-model.c:1299 ../libgda/gda-data-model.c:1338
-#: ../libgda/gda-data-model.c:1352
+#: ../libgda/gda-data-model.c:1127 ../libgda/gda-data-model.c:1166
+#: ../libgda/gda-data-model.c:1180
#, c-format
msgid "The '%s' parameter must hold a string value, ignored."
msgstr "'%s' 必须保持为字符串值，已忽略。"
-#: ../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
+#: ../libgda/gda-data-model.c:1189 ../libgda/gda-data-model.c:1199
+#: ../libgda/gda-data-model.c:1209 ../libgda/gda-data-model.c:1251
+#: ../libgda/gda-data-model.c:1296 ../libgda/gda-data-model.c:1306
+#: ../libgda/gda-data-model.c:1316 ../libgda/gda-data-model.c:1326
+#: ../libgda/gda-data-model.c:1354 ../libgda/gda-data-model.c:1364
+#: ../libgda/gda-data-model.c:1465
#, c-format
msgid "The '%s' parameter must hold a boolean value, ignored."
msgstr "'%s' 必须保持为布尔值，已忽略。"
-#: ../libgda/gda-data-model.c:1516
+#: ../libgda/gda-data-model.c:1344
#, c-format
msgid "The '%s' parameter must hold an integer value, ignored."
msgstr "“%s”参数必须为整数值，已忽略。"
-#: ../libgda/gda-data-model.c:1558
+#: ../libgda/gda-data-model.c:1386
#, c-format
msgid "Unknown GdaDataModelIOFormat %d value"
msgstr "未知的 GdaDataModelIOFormat %d 值"
-#: ../libgda/gda-data-model.c:1644
+#: ../libgda/gda-data-model.c:1472
#, c-format
msgid "File '%s' already exists"
msgstr "文件 '%s' 已经存在"
-#: ../libgda/gda-data-model.c:1821
+#: ../libgda/gda-data-model.c:1649
msgid "Exported Data"
msgstr "已导出的数据"
-#: ../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:1972
+#: ../libgda/gda-data-model.c:1797
msgid "Cannot retrieve column data type (type is UNKNOWN or not specified)"
msgstr "无法检索列数据类型 (类型是 UNKNOWN 或未指定)"
-#: ../libgda/gda-data-model.c:2058
+#: ../libgda/gda-data-model.c:1883
#, c-format
msgid "Expected tag <gda_array_data>, got <%s>"
msgstr "期望标记 <gda_array_data>，然而获得了 <%s>"
-#: ../libgda/gda-data-model.c:2130
+#: ../libgda/gda-data-model.c:1955
msgid "Could not get an iterator for source data model"
msgstr "无法为源数据模型获取一个迭代器"
-#: ../libgda/gda-data-model.c:2147
+#: ../libgda/gda-data-model.c:1972
#, c-format
msgid "Inexistent column in source data model: %d"
msgstr "源数据模型中不存在的列：%d"
-#: ../libgda/gda-data-model.c:2161
+#: ../libgda/gda-data-model.c:1986
#, 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:2171
+#: ../libgda/gda-data-model.c:1997
#, 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:2267
+#: ../libgda/gda-data-model.c:2093
#, 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:2474
+#: ../libgda/gda-data-model.c:2294
#, c-format
msgid "Could not dump data model's attributes: %s"
msgstr "无法转储数据模型属性：%s"
-#: ../libgda/gda-data-model.c:2482
+#: ../libgda/gda-data-model.c:2302
#, c-format
msgid "Could not dump data model's contents: %s"
msgstr "无法转储数据模型内容：%s"
-#: ../libgda/gda-data-model.c:2703
+#: ../libgda/gda-data-model.c:2523
msgid "Data model does not support backward cursor move"
msgstr "数据模型不支持后台游标移动"
-#: ../libgda/gda-data-model.c:3002
-#: ../tools/browser/common/gdaui-entry-import.c:214
+#: ../libgda/gda-data-model.c:2832 ../tools/browser/gdaui-entry-import.c:212
#: ../tools/browser/query-exec/query-result.c:229
#, c-format
msgid "%d row"
msgid_plural "%d rows"
msgstr[0] "%d 行"
-#: ../libgda/gda-data-model.c:3004
+#: ../libgda/gda-data-model.c:2834
#, c-format
msgid "0 row"
msgstr "0 行"
-#: ../libgda/gda-data-model-dir.c:869
+#: ../libgda/gda-data-model-dir.c:802
msgid "Row not found"
msgstr "没有找到行"
-#: ../libgda/gda-data-model-dir.c:997 ../libgda/gda-data-model-dir.c:999
+#: ../libgda/gda-data-model-dir.c:927 ../libgda/gda-data-model-dir.c:929
msgid "Column cannot be modified"
msgstr "列不能修改"
-#: ../libgda/gda-data-model-dir.c:1013 ../libgda/gda-data-model-dir.c:1016
-#: ../libgda/gda-data-model-dir.c:1229 ../libgda/gda-data-model-dir.c:1233
+#: ../libgda/gda-data-model-dir.c:943 ../libgda/gda-data-model-dir.c:946
+#: ../libgda/gda-data-model-dir.c:1159 ../libgda/gda-data-model-dir.c:1163
msgid "New path must be a subpath of the base directory"
msgstr "新路径必须是基目录的子路径"
-#: ../libgda/gda-data-model-dir.c:1056 ../libgda/gda-data-model-dir.c:1103
+#: ../libgda/gda-data-model-dir.c:986 ../libgda/gda-data-model-dir.c:1033
#, c-format
msgid "Could not rename file '%s' to '%s'"
msgstr "无法重命名文件 '%s' 为 '%s'"
-#: ../libgda/gda-data-model-dir.c:1082
+#: ../libgda/gda-data-model-dir.c:1012
#, c-format
msgid "Could not create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: ../libgda/gda-data-model-dir.c:1153
+#: ../libgda/gda-data-model-dir.c:1083
#, c-format
msgid "Could not overwrite contents of file '%s'"
msgstr "无法覆盖文件 '%s' 的内容"
-#: ../libgda/gda-data-model-dir.c:1173 ../libgda/gda-data-model-dir.c:1175
+#: ../libgda/gda-data-model-dir.c:1103 ../libgda/gda-data-model-dir.c:1105
msgid "Wrong type of data"
msgstr "错误的数据类型"
-#: ../libgda/gda-data-model-dir.c:1216 ../libgda/gda-data-model-dir.c:1219
+#: ../libgda/gda-data-model-dir.c:1146 ../libgda/gda-data-model-dir.c:1149
msgid "Column cannot be set"
msgstr "列无法设置"
-#: ../libgda/gda-data-model-dir.c:1292
+#: ../libgda/gda-data-model-dir.c:1222
#, c-format
msgid "Cannot set contents of filename '%s'"
msgstr "无法设置文件名 '%s' 的内容"
-#: ../libgda/gda-data-model-dir.c:1304
+#: ../libgda/gda-data-model-dir.c:1234
#, c-format
msgid "Cannot create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: ../libgda/gda-data-model-dir.c:1313 ../libgda/gda-data-model-dir.c:1315
+#: ../libgda/gda-data-model-dir.c:1243 ../libgda/gda-data-model-dir.c:1245
msgid "Cannot add row: filename missing"
msgstr "无法添加行：文件丢失"
-#: ../libgda/gda-data-model-dir.c:1357
+#: ../libgda/gda-data-model-dir.c:1287
#, c-format
msgid "Cannot remove file '%s'"
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:2632
+#: ../libgda/gda-data-model-dsn-list.c:99
+#: ../libgda/gda-data-model-dsn-list.c:100 ../tools/common/t-app.c:2532
+#: ../tools/common/t-config-info.c:427
msgid "DSN"
msgstr "DSN"
#. To translators: a "Connection string" is a semi-colon delimited list of key=value pairs which
#. * define the parameters for a connection, such as "DB_NAME=thedb;HOSTNAME=moon
-#: ../libgda/gda-data-model-dsn-list.c:123
-#: ../libgda/gda-data-model-dsn-list.c:124 ../tools/config-info.c:430
+#: ../libgda/gda-data-model-dsn-list.c:119
+#: ../libgda/gda-data-model-dsn-list.c:120 ../tools/common/t-config-info.c:430
msgid "Connection string"
msgstr "连接字符串"
-#: ../libgda/gda-data-model-dsn-list.c:135
-#: ../libgda/gda-data-model-dsn-list.c:136
+#: ../libgda/gda-data-model-dsn-list.c:131
+#: ../libgda/gda-data-model-dsn-list.c:132
msgid "Global"
msgstr "全局"
-#: ../libgda/gda-data-model-dsn-list.c:140
+#: ../libgda/gda-data-model-dsn-list.c:136
msgid "List of defined data sources"
msgstr "已定义的数据源列表"
-#: ../libgda/gda-data-model-import.c:504
+#: ../libgda/gda-data-model-import.c:490
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."
+#: ../libgda/gda-data-model-import.c:698
+#, fuzzy, c-format
+#| msgid "The '%s' option must hold a string value, ignored."
+msgid "The %s option must hold a string value, ignored."
msgstr "'%s' 选项必须保持为字符串类型，已忽略。"
-#: ../libgda/gda-data-model-import.c:734
+#: ../libgda/gda-data-model-import.c:714
#, c-format
msgid "The '%s' option must hold a boolean value, ignored."
msgstr "'%s' 选项必须保持为布尔型值，已忽略。"
-#: ../libgda/gda-data-model-import.c:977
+#: ../libgda/gda-data-model-import.c:955
#, c-format
msgid "The '%s' option must hold a GType value, ignored."
msgstr "'%s' 选项必须保持为 GType 值，已忽略。"
-#: ../libgda/gda-data-model-import.c:1043
+#: ../libgda/gda-data-model-import.c:1023
#, c-format
msgid "Character conversion at line %d, error: %s"
msgstr "在行 %d 中字符转换，错误：%s"
-#: ../libgda/gda-data-model-import.c:1046
-#: ../libgda/sqlite/gda-sqlite-provider.c:930
-#: ../providers/bdb/gda-bdb-provider.c:228
-#: ../tools/browser/common/gdaui-data-import.c:177
-#: ../tools/browser/data-manager/data-widget.c:611
+#: ../libgda/gda-data-model-import.c:1026
+#: ../libgda/sqlite/gda-sqlite-provider.c:1304
+#: ../providers/bdb/gda-bdb-provider.c:227
+#: ../tools/browser/data-manager/data-widget.c:607
+#: ../tools/browser/gdaui-data-import.c:177
msgid "no detail"
msgstr "无细节"
-#: ../libgda/gda-data-model-import.c:1086
+#: ../libgda/gda-data-model-import.c:1066
#, c-format
msgid "Could not convert string '%s' to a '%s' value"
msgstr "无法转换字符串 '%s' 到一个 '%s' 值"
-#: ../libgda/gda-data-model-import.c:1142
+#: ../libgda/gda-data-model-import.c:1124
#, c-format
msgid "Error while parsing CSV file: %s"
msgstr "解析 CSV 文件时出错：%s"
#. error
-#: ../libgda/gda-data-model-import.c:1242
+#: ../libgda/gda-data-model-import.c:1225
msgid "Failed to read node in XML file"
msgstr "在 XML 文件中读取节点失败"
-#: ../libgda/gda-data-model-import.c:1261
+#: ../libgda/gda-data-model-import.c:1244
#, c-format
msgid "Expected <gda_array> node in XML file, got <%s>"
msgstr "在 XML 文件中期望 <gda_array> 节点，但是获得了 <%s>"
-#: ../libgda/gda-data-model-import.c:1307
-#: ../libgda/gda-data-model-import.c:1629
+#: ../libgda/gda-data-model-import.c:1290
+#: ../libgda/gda-data-model-import.c:1612
msgid "No \"gdatype\" attribute specified in <gda_array_field>"
msgstr "在 <gda_array_field> 中没有指定“gdatype”属性"
-#: ../libgda/gda-data-model-import.c:1358
+#: ../libgda/gda-data-model-import.c:1341
msgid "Expected <gda_array_field> in <gda_array>"
msgstr "在 <gda_array> 期望获得 <gda_array_field>"
-#: ../libgda/gda-data-model-import.c:1389
+#: ../libgda/gda-data-model-import.c:1372
#, 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:1391
+#: ../libgda/gda-data-model-import.c:1374
msgid "Expected <gda_array_data> in <gda_array>"
msgstr "在 <gda_array> 中期望获得 <gda_array_data>"
-#: ../libgda/gda-data-model-import.c:1403
+#: ../libgda/gda-data-model-import.c:1386
msgid "Can't read the contents of the <gda_array_data> node"
msgstr "无法读取 <gda_array_data> 节点的内容"
-#: ../libgda/gda-data-model-import.c:1452
+#: ../libgda/gda-data-model-import.c:1435
#, 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:1476
+#: ../libgda/gda-data-model-import.c:1459
msgid "Row has too many values (which are ignored)"
msgstr "行有过多的值 (其被忽略)"
-#: ../libgda/gda-data-model-import.c:1523
+#: ../libgda/gda-data-model-import.c:1506
#, c-format
msgid "Could not convert '%s' to a value of type %s"
msgstr "无法将 '%s' 转换为一个 %s 类型的值"
-#: ../libgda/gda-data-model-import.c:1596
+#: ../libgda/gda-data-model-import.c:1579
#, c-format
msgid "Expected <gda_array> node but got <%s>"
msgstr "期望获得 <gda_array> 节点，但是获得了 <%s>"
-#: ../libgda/gda-data-model-import.c:1680
+#: ../libgda/gda-data-model-import.c:1663
msgid "No <gda_array_field> specified in <gda_array>"
msgstr "<gda_array> 中没有指定 <gda_array_field>"
-#: ../libgda/gda-data-model-import.c:1856 ../libgda/gda-data-select.c:3835
+#: ../libgda/gda-data-model-import.c:1842 ../libgda/gda-data-select.c:3813
msgid "Data model does not support random access"
msgstr "数据模型不支持随机访问"
-#: ../libgda/gda-data-model-import.c:1913
+#: ../libgda/gda-data-model-import.c:1902
#, c-format
msgid "Row at line %d does not have enough values"
msgstr "第 %d 行(line)的行(row)没有足够的值"
-#: ../libgda/gda-data-model-import.c:1918
+#: ../libgda/gda-data-model-import.c:1907
#, 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:1943
+#: ../libgda/gda-data-model-import.c:1933
#, c-format
msgid "Row at line %d does not have enough values (which are thus ignored)"
msgstr "%d 行 (line) 的行 (row) 没有足够的值 (因此已忽略之)"
-#: ../libgda/gda-data-model-iter.c:408 ../libgda/gda-data-model-iter.c:415
-msgid "GdaDataModel refused value change"
-msgstr "GdaDataModel 拒绝了值更改"
+#: ../libgda/gda-data-model-iter.c:194
+msgid "Iter has an invalid/non-existent reference to a data model"
+msgstr ""
-#. dummy setup to enable GIR compilation
-#: ../libgda/gda-data-model-ldap.c:137
-msgid ""
-"Dummy GdaDataModelLdap object: if you see this message in your application "
-"then it's likely that there is an installation problem with the LDAP "
-"provider. In any case the GdaDataModelLdap object won't be useable."
+#: ../libgda/gda-data-model-iter.c:198
+msgid "Referenced data model in iterator doesn't belong to given data model"
+msgstr "迭代器中引用的数据模型不属于给定的数据模型"
+
+#: ../libgda/gda-data-model-iter.c:396
+#, c-format
+msgid "Invalid data model. Can't validate holder"
msgstr ""
-"哑 GdaDataModelLdap 对象：如果您在应用程序中看到此消息，很可能 LDAP 提供程序"
-"安装出了问题。无论如何，GdaDataModelLdap 对象将不可用。"
-#: ../libgda/gda-data-pivot.c:494
+#: ../libgda/gda-data-model-iter.c:539
+msgid "Invalid data model object. Can't set property"
+msgstr ""
+
+#: ../libgda/gda-data-pivot.c:428
msgid "Pivot model not populated"
msgstr "Pivot 模型未增加(populated)"
-#: ../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
+#: ../libgda/gda-data-pivot.c:476 ../libgda/gda-data-pivot.c:488
+#: ../libgda/gda-data-pivot.c:540 ../libgda/gda-data-pivot.c:552
+#: ../libgda/gda-data-pivot.c:606 ../libgda/gda-data-pivot.c:657
+#: ../libgda/gda-data-pivot.c:822 ../libgda/gda-data-pivot.c:834
+#: ../libgda/gda-data-pivot.c:886 ../libgda/gda-data-pivot.c:898
+#: ../libgda/gda-data-pivot.c:950 ../libgda/gda-data-pivot.c:962
+#: ../libgda/gda-data-pivot.c:1014 ../libgda/gda-data-pivot.c:1026
+#: ../libgda/gda-data-pivot.c:1084
msgid "Integer overflow"
msgstr "整数值溢出"
-#: ../libgda/gda-data-pivot.c:772 ../libgda/gda-data-pivot.c:783
+#: ../libgda/gda-data-pivot.c:706 ../libgda/gda-data-pivot.c:717
msgid "Float value overflow"
msgstr "浮点值溢出"
-#: ../libgda/gda-data-pivot.c:837
+#: ../libgda/gda-data-pivot.c:771
msgid "Double value overflow"
msgstr "双精度值溢出"
-#: ../libgda/gda-data-pivot.c:1139
+#: ../libgda/gda-data-pivot.c:1073
msgid "Inconsistent data type"
msgstr "数据类型不一致"
-#: ../libgda/gda-data-pivot.c:1185
+#: ../libgda/gda-data-pivot.c:1119
msgid "Data type does not support requested computation"
msgstr "数据类型不支持请求的操作"
-#: ../libgda/gda-data-pivot.c:1283 ../libgda/gda-data-pivot.c:1313
-#: ../libgda/gda-data-pivot.c:1411 ../libgda/gda-data-pivot.c:1524
+#: ../libgda/gda-data-pivot.c:1218 ../libgda/gda-data-pivot.c:1248
+#: ../libgda/gda-data-pivot.c:1349 ../libgda/gda-data-pivot.c:1463
#, c-format
msgid "Wrong field format error: %s"
msgstr "错误的字段格式：%s"
-#: ../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
+#: ../libgda/gda-data-pivot.c:1232 ../libgda/gda-data-pivot.c:1336
+#: ../libgda/gda-data-pivot.c:1359 ../libgda/gda-data-pivot.c:1450
+#: ../libgda/gda-data-pivot.c:1473 ../libgda/gda-sql-builder.c:696
#, c-format
msgid "Wrong field format"
msgstr "错误的字段名格式"
-#: ../libgda/gda-data-pivot.c:1580
+#: ../libgda/gda-data-pivot.c:1520
msgid "No row field defined"
msgstr "没有定义行字段"
-#: ../libgda/gda-data-pivot.c:1627 ../libgda/gda-data-pivot.c:1639
-#: ../libgda/gda-data-pivot.c:1655
+#: ../libgda/gda-data-pivot.c:1567 ../libgda/gda-data-pivot.c:1579
+#: ../libgda/gda-data-pivot.c:1595
msgid "Could not get information from source data model"
msgstr "无法从源数据模型获取信息"
-#: ../libgda/gda-data-pivot.c:2117 ../libgda/gda-data-proxy.c:3081
-#: ../tools/gda-sql.c:3156
+#: ../libgda/gda-data-pivot.c:2062 ../libgda/gda-data-proxy.c:3053
+#: ../tools/common/t-app.c:3055
msgid "Could not create virtual connection"
msgstr "无法创建虚拟连接"
-#: ../libgda/gda-data-pivot.c:2133
+#: ../libgda/gda-data-pivot.c:2079
msgid "No source defined"
msgstr "没有定义源"
-#: ../libgda/gda-data-pivot.c:2151
+#: ../libgda/gda-data-pivot.c:2097
msgid "Invalid source data model (may have incompatible column names)"
msgstr "无效的源数据模型(可能是有不兼容的列名称)"
-#: ../libgda/gda-data-proxy.c:1006
+#: ../libgda/gda-data-proxy.c:967
msgid "GdaDataProxy can't handle non random access data models"
msgstr "GdaDataProxy 无法处理非随机访问数据模型"
-#: ../libgda/gda-data-proxy.c:1677 ../libgda/gda-data-proxy.c:4074
+#: ../libgda/gda-data-proxy.c:1644 ../libgda/gda-data-proxy.c:4051
msgid ""
"The first row is an empty row artificially prepended and cannot be removed"
msgstr "第一列是手工添加的空列，不能移除"
-#: ../libgda/gda-data-proxy.c:2187
+#: ../libgda/gda-data-proxy.c:2150
#, c-format
msgid ""
"Proxied data model reports the modifications as accepted, yet did not emit "
@@ -1331,7 +1462,7 @@ msgstr ""
"代理数据模型报告修改已接受，但却未发射对应的“row-inserted”、“row-updated”、"
"或“row-removed”信号。这是 %s 实现中的缺陷(请报告这个 bug)。"
-#: ../libgda/gda-data-proxy.c:2226
+#: ../libgda/gda-data-proxy.c:2189
#, c-format
msgid ""
"Proxied data model reports the modifications as accepted, yet did not emit "
@@ -1341,57 +1472,58 @@ msgstr ""
"代理数据模型报告修改已接受，但却未发射对应的“row-inserted”、“row-updated”、"
"或“row-removed”信号。这可能是 %s 实现中的缺陷(请报告这个 bug)。"
-#: ../libgda/gda-data-proxy.c:3123
+#: ../libgda/gda-data-proxy.c:3099
#, c-format
msgid "Error in filter expression: %s"
msgstr "过滤表达式中有错误：%s"
-#: ../libgda/gda-data-proxy.c:3137
+#: ../libgda/gda-data-proxy.c:3114
msgid "Error in filter expression"
msgstr "过滤表达式中有错误"
-#: ../libgda/gda-data-proxy.c:3252 ../libgda/gda-data-select.c:1669
+#: ../libgda/gda-data-proxy.c:3231 ../libgda/gda-data-select.c:1671
msgid "Incorrect filter expression"
msgstr "错误的过滤表达式"
-#: ../libgda/gda-data-proxy.c:3809
+#: ../libgda/gda-data-proxy.c:3786
msgid ""
"The first row is an empty row artificially prepended and cannot be altered"
msgstr "第一行是一个人工添加的空行，不能改变"
-#: ../libgda/gda-data-proxy.c:3838 ../libgda/gda-data-proxy.c:3849
+#: ../libgda/gda-data-proxy.c:3815 ../libgda/gda-data-proxy.c:3826
#, c-format
msgid "Wrong value type: expected '%s' and got '%s'"
msgstr "错误的值类型：期望 '%s' 然而获得了 '%s'"
-#: ../libgda/gda-data-proxy.c:3937
+#: ../libgda/gda-data-proxy.c:3914
#, c-format
msgid "Trying to change read-only column: %d"
msgstr "正在尝试更改只读列：%d"
-#: ../libgda/gda-data-proxy.c:3974
+#: ../libgda/gda-data-proxy.c:3951
#, c-format
msgid "Value type mismatch %s instead of %s"
msgstr "值类型失配 %s 而不是 %s"
-#: ../libgda/gda-data-select.c:412
-#, c-format
-msgid "Could not re-run SELECT statement: %s"
-msgstr "无法重新运行 SELECT 语句：%s"
+#: ../libgda/gda-data-select.c:664
+msgid ""
+"INTERNAL implementation error: unknown number of columns in GdaPStmt, \n"
+"set number of columns before using with GdaDataSelect"
+msgstr ""
-#: ../libgda/gda-data-select.c:1075
-msgid "Incorrect SQL expression"
-msgstr "错误的 SQL 表达式"
+#: ../libgda/gda-data-select.c:1073
+msgid "Incorrect SQL expression, only one modification statement is accepted"
+msgstr "不正确的SQL表达式，只接受一条修改语句"
-#: ../libgda/gda-data-select.c:1100
+#: ../libgda/gda-data-select.c:1099
msgid "Internal error: the \"prepared-stmt\" property has not been set"
msgstr "内部错误：“prepared-stmt”属性未设置"
-#: ../libgda/gda-data-select.c:1107
+#: ../libgda/gda-data-select.c:1106
msgid "Can't get the prepared statement's actual statement"
msgstr "无法获取准备就绪语句的实际语句"
-#: ../libgda/gda-data-select.c:1113
+#: ../libgda/gda-data-select.c:1112
msgid "Unsupported type of SELECT statement"
msgstr "SELECT 语句不支持的类型"
@@ -1425,524 +1557,802 @@ msgstr "修改语句的 '%1$s' 参数应该是 %3$s 时，成了 %2$s"
msgid "Modification statement must be an INSERT, UPDATE or DELETE statement"
msgstr "修改语句必须是 INSERT、UPDATE 或 DELETE 语句"
-#: ../libgda/gda-data-select.c:1504 ../libgda/gda-data-select.c:1724
-#: ../libgda/gda-data-select.c:3651
+#: ../libgda/gda-data-select.c:1504 ../libgda/gda-data-select.c:1726
+#: ../libgda/gda-data-select.c:3638
msgid "No connection to use"
msgstr "没有要使用的连接"
-#: ../libgda/gda-data-select.c:1564
+#: ../libgda/gda-data-select.c:1566
msgid "Invalid unique row condition (only equal operators are allowed)"
msgstr "无效的唯一列条件(只允许相等操作符)"
-#: ../libgda/gda-data-select.c:1596 ../libgda/gda-data-select.c:1651
+#: ../libgda/gda-data-select.c:1598 ../libgda/gda-data-select.c:1653
msgid "Unique row condition has already been specified"
msgstr "唯一列条件已经别指定"
-#: ../libgda/gda-data-select.c:1733 ../libgda/gda-data-select.c:1744
+#: ../libgda/gda-data-select.c:1735 ../libgda/gda-data-select.c:1746
msgid "No table to select from in SELECT statement"
msgstr "SELECT 语句中没有要选择的表"
-#: ../libgda/gda-data-select.c:1738
+#: ../libgda/gda-data-select.c:1740
msgid "SELECT statement uses more than one table to select from"
msgstr "SELECT 语句使用多于一个的表以从中选择"
-#: ../libgda/gda-data-select.c:1918 ../libgda/gda-data-select.c:2698
-#: ../libgda/gda-data-select.c:2868 ../libgda/gda-data-select.c:3022
-#: ../libgda/gda-data-select.c:3110 ../libgda/gda-data-select.c:3305
+#: ../libgda/gda-data-select.c:1914 ../libgda/gda-data-select.c:2746
+#: ../libgda/gda-data-select.c:2962 ../libgda/gda-data-select.c:3005
+#: ../libgda/gda-data-select.c:3087 ../libgda/gda-data-select.c:3282
msgid "Data model does only support random access"
msgstr "数据源只支持随机访问"
-#: ../libgda/gda-data-select.c:1959
+#: ../libgda/gda-data-select.c:1955
msgid "Unable to retrieve data after modifications"
msgstr "无法在修改后检索数据"
-#: ../libgda/gda-data-select.c:1983 ../libgda/gda-data-select.c:1994
-#: ../libgda/gda-data-select.c:2024
+#: ../libgda/gda-data-select.c:1979 ../libgda/gda-data-select.c:1990
+#: ../libgda/gda-data-select.c:2020
msgid ""
"Unable to retrieve data after modifications, no further modification will be "
"allowed"
msgstr "修改后无法检索数据，将不允许进一步修改"
-#: ../libgda/gda-data-select.c:2328 ../libgda/gda-data-select.c:2338
+#: ../libgda/gda-data-select.c:2159
+#, c-format
+msgid "Can't calculate internal row number: %s"
+msgstr "不能计算内部行数: %s"
+
+#: ../libgda/gda-data-select.c:2168
+#, fuzzy, c-format
+#| msgid "Could not fetch next row"
+msgid "Can't fetch next row: %s"
+msgstr "无法取回下一行"
+
+#: ../libgda/gda-data-select.c:2220
+#, c-format
+msgid "Can't move back iter at row: %s"
+msgstr ""
+
+#: ../libgda/gda-data-select.c:2229
+msgid "Internal error: No fetch_prev() method implementation for data model"
+msgstr "内部错误: 数据模型没有 fetch_prev() 方法实现"
+
+#: ../libgda/gda-data-select.c:2234
+#, fuzzy, c-format
+#| msgid "Can't load provider: %s"
+msgid "Can't fetch previous row: %s"
+msgstr "无法加载提供者：%s"
+
+#: ../libgda/gda-data-select.c:2276
+#, fuzzy, c-format
+#| msgid "Can't open pipe '%s': %s"
+msgid "Can't move iter at row '%d': %s"
+msgstr "无法打开管道“%s”：%s"
+
+#: ../libgda/gda-data-select.c:2295
+#, fuzzy, c-format
+#| msgid "Can't open pipe '%s': %s"
+msgid "Can't fetch row '%d': %s"
+msgstr "无法打开管道“%s”：%s"
+
+#: ../libgda/gda-data-select.c:2370 ../libgda/gda-data-select.c:2380
#, c-format
msgid "Could not change iter's value for column %d: %s"
msgstr "无法更改第 %d 列的迭代器(iter)的值：%s"
-#: ../libgda/gda-data-select.c:2333
+#: ../libgda/gda-data-select.c:2375
msgid "Allowed GdaHolder's value to be NULL for the iterator to be updated"
msgstr "为了更新迭代器，允许 GdaHolder 值为 NULL"
-#: ../libgda/gda-data-select.c:2418 ../libgda/gda-data-select.c:2511
+#: ../libgda/gda-data-select.c:2463 ../libgda/gda-data-select.c:2557
msgid "Some columns can't be modified"
msgstr "某些列不能修改"
-#: ../libgda/gda-data-select.c:2565
+#: ../libgda/gda-data-select.c:2612
msgid "Internal error: can't get the prepared statement's actual statement"
msgstr "内部错误：无法获取准备就绪语句的实际语句"
-#: ../libgda/gda-data-select.c:2605
+#: ../libgda/gda-data-select.c:2652
msgid "Unable to identify a way to fetch a single row"
msgstr "无法确定出取回单行的方法"
-#: ../libgda/gda-data-select.c:2612
+#: ../libgda/gda-data-select.c:2659
msgid "Can only operate on non compound SELECT statements"
msgstr "只能在非复合 SELECT 语句上操作"
-#: ../libgda/gda-data-select.c:2693 ../libgda/gda-data-select.c:2863
-#: ../libgda/gda-data-select.c:2934 ../libgda/gda-data-select.c:3017
-#: ../libgda/gda-data-select.c:3105 ../libgda/gda-data-select.c:3300
+#: ../libgda/gda-data-select.c:2741 ../libgda/gda-data-select.c:2911
+#: ../libgda/gda-data-select.c:3082 ../libgda/gda-data-select.c:3277
msgid "Modifications are not allowed anymore"
msgstr "不再允许修改"
-#: ../libgda/gda-data-select.c:2703 ../libgda/gda-data-select.c:2873
-#: ../libgda/gda-data-select.c:2939 ../libgda/gda-data-select.c:3027
+#: ../libgda/gda-data-select.c:2751 ../libgda/gda-data-select.c:2916
msgid "No UPDATE statement provided"
msgstr "没有提供 UPDATE 语句"
-#: ../libgda/gda-data-select.c:2743
+#: ../libgda/gda-data-select.c:2791
msgid "Could not get iterator's value"
msgstr "无法获取迭代器的值"
-#: ../libgda/gda-data-select.c:2900 ../libgda/gda-data-select.c:2967
+#: ../libgda/gda-data-select.c:2940
#, c-format
msgid "Column %d can't be modified"
msgstr "列 %d 不能修改"
-#: ../libgda/gda-data-select.c:3035
+#: ../libgda/gda-data-select.c:3013
#, c-format
msgid "Too many values (%d as maximum)"
msgstr "过多的值 (最大 %d)"
-#: ../libgda/gda-data-select.c:3115
+#: ../libgda/gda-data-select.c:3092
msgid "No INSERT statement provided"
msgstr "没有提供 INSERT 语句"
-#: ../libgda/gda-data-select.c:3120
-msgid "Cannot add a row because the number of rows in unknown"
+#: ../libgda/gda-data-select.c:3097
+#, fuzzy
+#| msgid "Cannot add a row because the number of rows in unknown"
+msgid "Cannot add a row because the number of rows is unknown"
msgstr "无法添加行，因为行数未知"
-#: ../libgda/gda-data-select.c:3149
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:394
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:403
+#: ../libgda/gda-data-select.c:3126
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:392
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:401
msgid "Missing values to insert in INSERT statement"
msgstr "INSERT 语句丢失要插入的值"
-#: ../libgda/gda-data-select.c:3310
+#: ../libgda/gda-data-select.c:3287
msgid "No DELETE statement provided"
msgstr "没有提供 DELETE 语句"
-#: ../libgda/gda-data-select.c:3785
+#: ../libgda/gda-data-select.c:3606
+#, c-format
+msgid ""
+"Internal error: GdaDataSelect has %d GdaColumns, and SELECT statement has %d "
+"expressions"
+msgstr ""
+
+#: ../libgda/gda-data-select.c:3762
#, 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:3840
+#: ../libgda/gda-data-select.c:3818
msgid "Data model has been modified"
msgstr "数据模型已修改"
-#: ../libgda/gda-data-select.c:3849
+#: ../libgda/gda-data-select.c:3827
msgid "Data model contains BLOBs"
msgstr "数据模型包含 BLOB"
-#: ../libgda/gda-data-select.c:3860
+#: ../libgda/gda-data-select.c:3838
msgid "Can't get the number of rows of data model"
msgstr "无法获得数据模型的行数"
-#: ../libgda/gda-holder.c:544 ../libgda/gda-set.c:1183
+#: ../libgda/gda-db-column.c:626
+#, c-format
+msgid "Invalid column type %s. See API for gda_g_type_from_string ().\n"
+msgstr "无效的列类型%s。参见 gda_g_type_from_string() 的API。\n"
+
+#: ../libgda/gda-db-column.c:1111 ../libgda/gda-db-column.c:1218
+#, fuzzy, c-format
+#| msgid "Internal error: can't get the prepared statement's actual statement"
+msgid "Internal error: Operation should be prepared, setting a connection data"
+msgstr "内部错误：无法获取准备就绪语句的实际语句"
+
+#: ../libgda/gda-db-column.c:1412 ../libgda/gda-db-view.c:734
+#: ../libgda/gda-db-index.c:516
+#, fuzzy, c-format
+#| msgid "Provider error: %s method not implemented for provider %s"
+msgid "Operation is not implemented for the used provider"
+msgstr "提供者错误：%s 方法没有为提供者 %s 实现"
+
+#: ../libgda/gda-db-catalog.c:236
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not parse '%s': Validation for XML files for server operations will "
+#| "not be performed (some weird errors may occur)"
+msgid ""
+"Could not parse '%s': Validation for XML files for GdaDbCreator will not be "
+"performed (some weird errors may occur)"
+msgstr "无法解析 %s：将不作 XML 的服务器操作有效性检查(可能出现了异常的错误)"
+
+#: ../libgda/gda-db-catalog.c:260
+#, c-format
+msgid "Context to validate xml file can't be created."
+msgstr "无法创建验证 xml 文件的上下文。"
+
+#: ../libgda/gda-db-catalog.c:278
+#, fuzzy, c-format
+#| msgid "Value is invalid"
+msgid "xml file is invalid"
+msgstr "值无效"
+
+#: ../libgda/gda-db-catalog.c:319
+#, fuzzy, c-format
+#| msgid "Root node of file '%s' should be <schema>."
+msgid "Root node should be <schema>."
+msgstr "文件 '%s' 的根节点应该为 <schema>。"
+
+#: ../libgda/gda-db-catalog.c:452 ../libgda/gda-db-catalog.c:503
+#, c-format
+msgid "xmlDoc object can't be created from xmfile name '%s'"
+msgstr "xmlDoc 对象不能从名为 '%s' 的 xml文件名创建"
+
+#: ../libgda/gda-db-catalog.c:461
+#, fuzzy, c-format
+#| msgid "Parameter '%s' is invalid"
+msgid "xml file '%s' is not valid\n"
+msgstr "参数 '%s' 无效"
+
+#: ../libgda/gda-db-catalog.c:957 ../libgda/gda-db-table.c:742
+#, fuzzy, c-format
+#| msgid "Connection not yet opened"
+msgid "Connection is not opened"
+msgstr "连接尚未打开"
+
+#: ../libgda/gda-db-catalog.c:1146
+#, fuzzy, c-format
+#| msgid "Can't open file '%s' for reading: %s\n"
+msgid "Can't open stream for reading file '%s'"
+msgstr "无法打开文件 '%s' 以便读取：%s\n"
+
+#: ../libgda/gda-db-catalog.c:1162
+#, fuzzy, c-format
+#| msgid "Cannot create directory '%s'"
+msgid "Can't create parse context for '%s'"
+msgstr "无法创建目录 '%s'"
+
+#: ../libgda/gda-db-catalog.c:1178
+#, c-format
+msgid "Error during parsing with error '%d'"
+msgstr "解析过程中出现错误，错误为 '%d'"
+
+#: ../libgda/gda-db-catalog.c:1195
+#, fuzzy, c-format
+#| msgid "Failed to declare foreign key: %s"
+msgid "Failed to parse file: '%s'"
+msgstr "声明外键失败：%s"
+
+#: ../libgda/gda-db-catalog.c:1206
+#, c-format
+msgid "XML Document can't be created from file: '%s'"
+msgstr ""
+
+#: ../libgda/gda-db-catalog.c:1216
+#, c-format
+msgid "XML file is not valid\n"
+msgstr "XML 文件无效\n"
+
+#: ../libgda/gda-db-table.c:750
+#, c-format
+msgid "Empty column list"
+msgstr ""
+
+#: ../libgda/gda-db-view.c:538
+#, fuzzy, c-format
+#| msgid "View table's contents"
+msgid "View name is not set"
+msgstr "查看表的内容"
+
+#: ../libgda/gda-db-view.c:545
+#, fuzzy, c-format
+#| msgid "View definition: %s"
+msgid "View definition is not set"
+msgstr "视图定义：%s"
+
+#: ../libgda/gda-holder.c:503 ../libgda/gda-set.c:1157
#, c-format
msgid "Unable to set holder's value: %s"
msgstr "无法设置保持器的值：%s"
-#: ../libgda/gda-holder.c:645
+#: ../libgda/gda-holder.c:640
msgid "The 'g-type' property cannot be changed"
-msgstr "'g-type' 属性不能更改。"
+msgstr "'g-type' 属性不能更改"
-#: ../libgda/gda-holder.c:936
+#: ../libgda/gda-holder.c:945
#, c-format
msgid "Unable to convert string to '%s' type"
msgstr "无法转换字符串到“%s”类型"
-#: ../libgda/gda-holder.c:999
+#: ../libgda/gda-holder.c:1013
+#, c-format
msgid ""
"Can't use this method to set value because there is already a static value"
msgstr "无法使用此方法设置值，因为已经有一个静态值"
-#: ../libgda/gda-holder.c:1018 ../libgda/gda-holder.c:1166
+#: ../libgda/gda-holder.c:1044 ../libgda/gda-holder.c:1190
#, c-format
msgid "(%s): Holder does not allow NULL values"
msgstr "(%s)：保持器不允许取空(NULL)值"
-#: ../libgda/gda-holder.c:1025
+#: ../libgda/gda-holder.c:1051
#, c-format
msgid ""
"(%s): Wrong Holder value type, expected type '%s' when value's type is '%s'"
msgstr "(%s)：错误的保持器值(Holder)类型，应为“%s”类型，而值的类型为“%s”"
-#: ../libgda/gda-holder.c:1173
+#: ../libgda/gda-holder.c:1197
#, c-format
msgid "(%s): Wrong value type: expected type '%s' when value's type is '%s'"
msgstr "(%s)：错误的值类型：应为“%s”类型，而值的类型为“%s”"
-#: ../libgda/gda-holder.c:1652
+#: ../libgda/gda-holder.c:1665
#, 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:1739
+#: ../libgda/gda-holder.c:1755
#, 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:1790
+#: ../libgda/gda-holder.c:1808
msgid "Cannot bind holders if their type is not the same"
msgstr "保持器类型不同时无法绑定"
-#: ../libgda/gda-holder.c:1953
+#: ../libgda/gda-holder.c:1974
#, c-format
msgid "Could not change GdaHolder to match value change in bound GdaHolder: %s"
msgstr "无法更改 GdaHolder 来匹配绑定的 GdaHolder 的值变化：%s"
-#: ../libgda/gda-init.c:133
+#: ../libgda/gda-init.c:61
msgid "Ignoring attempt to re-initialize GDA library."
msgstr "正在忽略重新初始化 GDA 库的尝试。"
-#: ../libgda/gda-init.c:148
+#: ../libgda/gda-init.c:76
msgid "libgda needs GModule. Finishing..."
msgstr "libgda 需要 GModule。正在终止..."
-#: ../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: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:654
+#: ../libgda/gda-meta-store.c:824
msgid "Connection string for the internal connection to use"
msgstr "内部连接用的连接字符串"
-#: ../libgda/gda-meta-store.c:657
+#: ../libgda/gda-meta-store.c:827
msgid "Connection object internally used"
msgstr "连接对象被内部使用"
-#: ../libgda/gda-meta-store.c:660
+#: ../libgda/gda-meta-store.c:830
msgid "Catalog in which the database objects will be created"
msgstr "将创建的数据库对象所属的分类"
-#: ../libgda/gda-meta-store.c:663
+#: ../libgda/gda-meta-store.c:833
msgid "Schema in which the database objects will be created"
msgstr "将创建的数据库对象所用的方案"
-#: ../libgda/gda-meta-store.c:812
+#: ../libgda/gda-meta-store.c:992
msgid "Catalog specified but no schema specified, store will not be usable"
msgstr "指定了分类而没有指定方案，将不能保存"
-#: ../libgda/gda-meta-store.c:900
+#: ../libgda/gda-meta-store.c:1081
msgid "Can't obtain connection lock"
msgstr "无法获得连接锁"
-#: ../libgda/gda-meta-store.c:1159 ../libgda/gda-meta-store.c:1168
-#: ../libgda/gda-meta-store.c:2362 ../libgda/gda-meta-store.c:2371
-msgid "Could not set the internal schema's version"
+#: ../libgda/gda-meta-store.c:1208
+#, fuzzy, c-format
+#| msgid "Could not open binding connection: %s"
+msgid "Could not open internal GdaMetaStore connection: %s"
+msgstr "无法打开绑定的连接：%s"
+
+#: ../libgda/gda-meta-store.c:1214
+#, fuzzy, c-format
+#| msgid "Could not create virtual connection"
+msgid "Could not create internal GdaMetaStore connection: %s"
+msgstr "无法创建虚拟连接"
+
+#: ../libgda/gda-meta-store.c:1354
+#, c-format
+msgid ""
+"Internal error while trying to render operation in MetaStore creation: %s"
+msgstr ""
+
+#: ../libgda/gda-meta-store.c:1355 ../libgda/gda-meta-store.c:1363
+#: ../libgda/gda-row.c:276
+msgid "No error was set"
+msgstr ""
+
+#: ../libgda/gda-meta-store.c:1361
+#, c-format
+msgid "Internal Error. Couldn't create MetaStore table '%s': %s"
+msgstr "内部错误。无法创建 MetaStore 表 '%s': %s"
+
+#: ../libgda/gda-meta-store.c:1378
+#, fuzzy
+#| msgid "Could not set the internal schema's version"
+msgid ""
+"Could not set the internal schema's version. No prepared statement's "
+"parameters were found"
+msgstr "无法设置内部方案版本"
+
+#: ../libgda/gda-meta-store.c:1387
+#, fuzzy
+#| msgid "Could not set the internal schema's version"
+msgid "Could not set the internal schema's version. Statement execution fails"
msgstr "无法设置内部方案版本"
-#: ../libgda/gda-meta-store.c:1537
+#: ../libgda/gda-meta-store.c:1591
+#, c-format
+msgid "Internal error: no information schema was found: %s"
+msgstr ""
+
+#: ../libgda/gda-meta-store.c:1599
+#, fuzzy, c-format
+#| msgid "Internal error: can't get the prepared statement's actual statement"
+msgid "Internal error: can't read information schema: %s"
+msgstr "内部错误：无法获取准备就绪语句的实际语句"
+
+#: ../libgda/gda-meta-store.c:1773
msgid "Missing view name from <view> node"
msgstr "<view> 节点中丢失视图名"
-#: ../libgda/gda-meta-store.c:1577
+#: ../libgda/gda-meta-store.c:1815
msgid "Missing view definition from <view> node"
msgstr "从 <view> 节点中丢失查看定义"
-#: ../libgda/gda-meta-store.c:1591
+#: ../libgda/gda-meta-store.c:1829
#, c-format
msgid "View definition contains more than one statement (for view '%s')"
msgstr "视图定义包含多于一个的语句 (视图 '%s')"
-#: ../libgda/gda-meta-store.c:1618
+#: ../libgda/gda-meta-store.c:1856
#, c-format
msgid "View definition is not a selection statement (for view '%s')"
msgstr "视图定义不是一个选择语句 (视图 '%s')"
-#: ../libgda/gda-meta-store.c:1645 ../libgda/gda-meta-struct-io.c:178
+#: ../libgda/gda-meta-store.c:1883 ../libgda/gda-meta-struct-io.c:179
msgid "Missing table name from <table> node"
msgstr "<table> 节点中丢失表名"
-#: ../libgda/gda-meta-store.c:1881
+#: ../libgda/gda-meta-store.c:2126
#, c-format
msgid "Column '%s' already exists and has different characteristics"
msgstr "列 '%s' 已经存在并且有不同的特征"
-#: ../libgda/gda-meta-store.c:1916
+#: ../libgda/gda-meta-store.c:2161
#, c-format
msgid "Missing foreign key's referenced table name (for table '%s')"
msgstr "缺少外键的引用表名称(对于表“%s”)"
-#: ../libgda/gda-meta-store.c:1970
+#: ../libgda/gda-meta-store.c:2217
#, c-format
msgid "Missing foreign key's column name (for table '%s')"
msgstr "缺少外键的列名称(对于表“%s”)"
-#: ../libgda/gda-meta-store.c:1982
+#: ../libgda/gda-meta-store.c:2229
#, c-format
msgid "Column '%s' not found in table '%s'"
msgstr "列 '%s' 没有在表 '%s' 中找到"
-#: ../libgda/gda-meta-store.c:2237 ../libgda/gda-meta-struct.c:1336
+#: ../libgda/gda-meta-store.c:2488 ../libgda/gda-meta-struct.c:1277
#, c-format
msgid "Foreign key column '%s' not found in table '%s'"
msgstr "在表“%2$s”中没有找到外键列“%1$s”"
-#: ../libgda/gda-meta-store.c:2419 ../libgda/gda-meta-store.c:2451
+#: ../libgda/gda-meta-store.c:2613
+#, fuzzy
+#| msgid "Could not set the internal schema's version"
+msgid ""
+"Could not update the internal schema's version. No prepared statement's "
+"parameters were found"
+msgstr "无法设置内部方案版本"
+
+#: ../libgda/gda-meta-store.c:2622
+#, fuzzy
+#| msgid "Could not set the internal schema's version"
+msgid ""
+"Could not update the internal schema's version. Statement execution fails"
+msgstr "无法设置内部方案版本"
+
+#: ../libgda/gda-meta-store.c:2669 ../libgda/gda-meta-store.c:2700
#, c-format
msgid "Schema description does not contain the object '%s', check installation"
msgstr "方案不包含对象 '%s'，请检查安装"
-#: ../libgda/gda-meta-store.c:2490
+#: ../libgda/gda-meta-store.c:2739
#, c-format
msgid "Could not find description for column named '%s'"
msgstr "无法找到名为“%s”的列的描述"
-#: ../libgda/gda-meta-store.c:2605 ../libgda/gda-meta-store.c:2616
-#: ../libgda/gda-meta-store.c:2650
+#: ../libgda/gda-meta-store.c:2858 ../libgda/gda-meta-store.c:2869
+#: ../libgda/gda-meta-store.c:2906
msgid "Could not get the internal schema's version"
msgstr "无法获取内部方案版本"
-#: ../libgda/gda-meta-store.c:2774 ../libgda/gda-meta-store.c:2896
-#: ../tools/gda-sql.c:850
+#: ../libgda/gda-meta-store.c:3029 ../libgda/gda-meta-store.c:3153
+#: ../tools/common/t-context.c:289
msgid "More than one SQL statement"
msgstr "多于一个的 SQL 语句"
-#: ../libgda/gda-meta-store.c:2803 ../libgda/gda-meta-store.c:2924
+#: ../libgda/gda-meta-store.c:3058 ../libgda/gda-meta-store.c:3181
#, c-format
msgid "Parameter '%s' is not present in statement"
msgstr "语句中不存在参数 '%s'"
-#: ../libgda/gda-meta-store.c:2820 ../libgda/gda-meta-store.c:2938
+#: ../libgda/gda-meta-store.c:3068
+#, fuzzy, c-format
+#| msgid "Error while fetching meta data from the connection: %s"
+msgid "While extracting data from Meta Store: %s"
+msgstr "从连接中获取元数据出错：%s"
+
+#: ../libgda/gda-meta-store.c:3080 ../libgda/gda-meta-store.c:3200
#, c-format
msgid "No value set for parameter '%s'"
msgstr "没有为参数 '%s' 设置值"
-#: ../libgda/gda-meta-store.c:3527
+#: ../libgda/gda-meta-store.c:3188
+#, fuzzy, c-format
+#| msgid "Error while fetching meta data from the connection: %s"
+msgid "While extracting data from store: %s"
+msgstr "从连接中获取元数据出错：%s"
+
+#: ../libgda/gda-meta-store.c:3523
+#, c-format
+msgid ""
+"Internal error, while updating internal meta store table '%s': Parameter "
+"value type error: %s"
+msgstr ""
+
+#: ../libgda/gda-meta-store.c:3786
msgid "Data models should have the same number of columns"
msgstr "数据模型应该包含同样数量的列"
-#: ../libgda/gda-meta-store.c:3590 ../libgda/gda-meta-store.c:4637
-#: ../libgda/gda-meta-store.c:4740
+#: ../libgda/gda-meta-store.c:3850 ../libgda/gda-meta-store.c:4888
+#: ../libgda/gda-meta-store.c:4992
#, c-format
msgid "Unknown database object '%s'"
msgstr "未知数据库对象 '%s'"
-#: ../libgda/gda-meta-store.c:3606
+#: ../libgda/gda-meta-store.c:3866
#, c-format
msgid "Could not set value for parameter '%s'"
msgstr "无法为参数 '%s' 设置值"
-#: ../libgda/gda-meta-store.c:3635
+#: ../libgda/gda-meta-store.c:3895
msgid "Could not create SELECT statement"
msgstr "无法创建 SELECT 语句"
-#: ../libgda/gda-meta-store.c:3650
+#: ../libgda/gda-meta-store.c:3910
msgid "Could not create DELETE statement"
msgstr "无法创建 DELETE 语句"
-#: ../libgda/gda-meta-store.c:3700
+#: ../libgda/gda-meta-store.c:3961
msgid "A transaction has already been started"
msgstr "已经开始了一个事务"
-#: ../libgda/gda-meta-store.c:4087
+#: ../libgda/gda-meta-store.c:4337
#, c-format
msgid "Attribute '%s' not found"
msgstr "属性 '%s' 未找到"
-#: ../libgda/gda-meta-store.c:4090
+#: ../libgda/gda-meta-store.c:4340
#, c-format
msgid "Attribute '%s' has %d value"
msgid_plural "Attribute '%s' has %d values"
msgstr[0] "属性 '%s' 的值为 %d"
-#: ../libgda/gda-meta-store.c:4137
+#: ../libgda/gda-meta-store.c:4385
msgid "Attributes names starting with a '_' are reserved for internal usage"
msgstr "以一个 '_' 开头的属性名保留做内部使用"
-#: ../libgda/gda-meta-store.c:4165
+#: ../libgda/gda-meta-store.c:4411
msgid ""
"Could not start a transaction because one already started, this could lead "
"to GdaMetaStore attributes problems"
msgstr ""
"无法开始事务，因为已经启动了一个事务；同时进行可能导致 GdaMetaStore 属性问题"
-#: ../libgda/gda-meta-store.c:4280
+#: ../libgda/gda-meta-store.c:4528
msgid "Could not parse XML description of custom database object to add"
msgstr "无法解析要添加的自定义数据库对象的 XML 描述"
-#: ../libgda/gda-meta-store.c:4294
+#: ../libgda/gda-meta-store.c:4541
msgid "Missing custom database object name"
msgstr "丢失自定义数据库对象名"
-#: ../libgda/gda-meta-store.c:4299
+#: ../libgda/gda-meta-store.c:4546
msgid ""
"Custom database object names starting with a '_' are reserved for internal "
"usage"
msgstr "以一个 '_' 开始的自定义数据库对象名保留作内部使用"
-#: ../libgda/gda-meta-store.c:4397
+#: ../libgda/gda-meta-store.c:4644
msgid "Another object with the same name already exists"
msgstr "有同样名称的另一个对象已经存在"
-#: ../libgda/gda-meta-store.c:4499
+#: ../libgda/gda-meta-store.c:4751
msgid "Missing table name in meta data context"
msgstr "在元数据上下文中丢失表名"
-#: ../libgda/gda-meta-store.c:4526
+#: ../libgda/gda-meta-store.c:4776
msgid "Missing column name in meta data context"
msgstr "在元数据上下文中丢失列名"
-#: ../libgda/gda-meta-store.c:4542
+#: ../libgda/gda-meta-store.c:4792
#, c-format
msgid "Missing condition in meta data context"
msgstr "在元数据上下文中缺少条件"
-#: ../libgda/gda-meta-store.c:4567
+#: ../libgda/gda-meta-store.c:4817
#, c-format
msgid "Malformed condition in meta data context"
msgstr "元数据上下文中的条件损坏"
-#: ../libgda/gda-meta-store.c:4584
+#: ../libgda/gda-meta-store.c:4834
#, c-format
msgid "Unknown column name '%s' in meta data context"
msgstr "元数据上下文中未知的列名 '%s'"
-#: ../libgda/gda-meta-store.c:4606
+#: ../libgda/gda-meta-store.c:4856
msgid "Unknown table in meta data context"
msgstr "元数据上下文中未知的表名"
-#: ../libgda/gda-meta-store.c:4879 ../libgda/gda-meta-store.c:4909
-#: ../libgda/gda-meta-store.c:5098 ../libgda/gda-meta-store.c:5127
-#: ../libgda/gda-meta-struct.c:506 ../libgda/gda-meta-struct.c:521
-#: ../libgda/gda-meta-struct.c:538
+#: ../libgda/gda-meta-store.c:5131 ../libgda/gda-meta-store.c:5161
+#: ../libgda/gda-meta-store.c:5350 ../libgda/gda-meta-store.c:5379
+#: ../libgda/gda-meta-struct.c:453 ../libgda/gda-meta-struct.c:468
+#: ../libgda/gda-meta-struct.c:485
#, c-format
msgid "Could not find object named '%s'"
msgstr "无法找到名为 '%s' 的对象"
-#: ../libgda/gda-meta-store.c:4977 ../libgda/gda-meta-store.c:4996
+#: ../libgda/gda-meta-store.c:5229 ../libgda/gda-meta-store.c:5248
#, c-format
msgid "Could not find column '%s' in table '%s'"
msgstr "在表“%2$s”中找不到列“%1$s”"
-#: ../libgda/gda-meta-struct.c:134
+#. To translators: GdaMetaStore is an object holding meta data information
+#. * which will be used as an information source
+#: ../libgda/gda-meta-struct.c:103
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:142
+#: ../libgda/gda-meta-struct.c:111
msgid "Features to compute"
msgstr "要计算的功能(Features)"
-#: ../libgda/gda-meta-struct.c:844
+#: ../libgda/gda-meta-struct.c:793
#, 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:870
+#: ../libgda/gda-meta-struct.c:819
#, c-format
msgid "View %s.%s.%s not found in meta store object"
msgstr "在源数据对象中没找到视图 %s.%s.%s"
-#: ../libgda/gda-meta-struct.c:952
+#: ../libgda/gda-meta-struct.c:899
#, c-format
msgid "Table %s.%s.%s not found (or missing columns information)"
msgstr "没有找到表 %s.%s.%s (或者丢失列信息)"
-#: ../libgda/gda-meta-struct.c:1099
+#: ../libgda/gda-meta-struct.c:1040
#, c-format
msgid "Internal GdaMetaStore error: column %s not found"
msgstr "内部 GdaMetaStore 错误：没有找到列 %s"
-#: ../libgda/gda-meta-struct.c:1251
+#: ../libgda/gda-meta-struct.c:1192
#, 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:2574
+#: ../libgda/gda-meta-struct.c:1724
+#, c-format
+msgid "No meta struct was provided for object sorting"
+msgstr ""
+
+#: ../libgda/gda-meta-struct.c:2530
msgid "Missing object name in GdaMetaDbObject structure"
msgstr "GdaMetaDbObject 结构中丢失对象名"
-#: ../libgda/gda-meta-struct.c:2599
+#: ../libgda/gda-meta-struct.c:2555
#, c-format
msgid "Database object '%s' already exists"
msgstr "数据库对象 '%s' 已经存在"
-#: ../libgda/gda-meta-struct-io.c:83
+#: ../libgda/gda-meta-struct-io.c:84
#, c-format
msgid "Could not load file '%s'"
msgstr "无法加载文件 '%s'"
-#: ../libgda/gda-meta-struct-io.c:90
+#: ../libgda/gda-meta-struct-io.c:91
#, c-format
msgid "Root node of file '%s' should be <schema>."
msgstr "文件 '%s' 的根节点应该为 <schema>。"
-#: ../libgda/gda-meta-struct-io.c:238
+#: ../libgda/gda-meta-struct-io.c:239
#, c-format
msgid "Missing column name for table '%s'"
msgstr "表 '%s' 丢失列名"
-#: ../libgda/gda-meta-struct-io.c:294
+#: ../libgda/gda-meta-struct-io.c:292
#, c-format
msgid "Missing foreign key's referenced table name for table '%s'"
msgstr "表“%s”缺少外键的引用表名称"
-#: ../libgda/gda-meta-struct-io.c:306 ../libgda/gda-meta-struct-io.c:313
-#: ../libgda/gda-meta-struct-io.c:320
+#: ../libgda/gda-meta-struct-io.c:304 ../libgda/gda-meta-struct-io.c:311
+#: ../libgda/gda-meta-struct-io.c:318
#, c-format
msgid "Invalid referenced table name '%s'"
msgstr "无效的引用表名 '%s'"
-#: ../libgda/gda-meta-struct-io.c:360
+#: ../libgda/gda-meta-struct-io.c:358
#, c-format
msgid "Missing foreign key's column name for table '%s'"
msgstr "表“%s”缺少外键的列名称"
-#: ../libgda/gda-row.c:295 ../libgda/gda-row.c:310 ../libgda/gda-row.c:360
+#: ../libgda/gda-provider-meta.c:83
+#, fuzzy, c-format
+#| msgid "No connection to use"
+msgid "No connection is set"
+msgstr "没有要使用的连接"
+
+#: ../libgda/gda-provider-meta.c:88
+#, fuzzy, c-format
+#| msgid "Connection is alreay opened"
+msgid "Connection is no opened"
+msgstr "连接已打开"
+
+#: ../libgda/gda-provider-meta.c:126
+#, c-format
+msgid "No rows or more than one row was returned from query"
+msgstr ""
+
+#: ../libgda/gda-row.c:162
+#, fuzzy
+#| msgid "Can't get the number of rows of data model"
+msgid "Can't set a number of values, because a data model is in use"
+msgstr "无法获得数据模型的行数"
+
+#: ../libgda/gda-row.c:275
+#, c-format
+msgid "No value can be retrieved from data model's row: %s"
+msgstr ""
+
+#: ../libgda/gda-row.c:276
+msgid "No Detail"
+msgstr "无细节"
+
+#: ../libgda/gda-row.c:327 ../libgda/gda-row.c:342 ../libgda/gda-row.c:393
msgid "Value not found in row!"
msgstr "行中没有找到值！"
-#: ../libgda/gda-server-operation.c:605
+#: ../libgda/gda-server-operation.c:582
#, c-format
msgid "GdaServerOperation: could not find file '%s'"
msgstr "GdaServerOperation：无法找到文件 '%s'"
-#: ../libgda/gda-server-operation.c:616
+#: ../libgda/gda-server-operation.c:596
#, c-format
msgid "GdaServerOperation: could not load file '%s'"
msgstr "GdaServerOperation：无法加载文件 '%s'"
-#: ../libgda/gda-server-operation.c:632 ../libgda/gda-server-operation.c:1036
+#: ../libgda/gda-server-operation.c:640
+#, fuzzy
+#| msgid "GdaServerOperation: could not load file '%s'"
+msgid "GdaServerOperation: could not load specified contents"
+msgstr "GdaServerOperation：无法加载文件 '%s'"
+
+#: ../libgda/gda-server-operation.c:655 ../libgda/gda-server-operation.c:1110
#, c-format
msgid "Could not load XML specifications: %s"
msgstr "无法加载 XML 规范：%s"
-#: ../libgda/gda-server-operation.c:702
+#: ../libgda/gda-server-operation.c:748
+#, 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-server-operation.c:773
#, c-format
msgid ""
"GdaServerOperation: file '%s' does not conform to DTD:\n"
@@ -1951,7 +2361,7 @@ msgstr ""
"GdaServerOperation：文件 '%s' 不符合 DTD：\n"
"%s"
-#: ../libgda/gda-server-operation.c:705
+#: ../libgda/gda-server-operation.c:776
#, c-format
msgid ""
"GdaServerOperation specification does not conform to DTD:\n"
@@ -1960,592 +2370,701 @@ msgstr ""
"GdaServerOperation 规范不符合 DTD：\n"
"%s"
-#: ../libgda/gda-server-operation.c:712
+#: ../libgda/gda-server-operation.c:783
#, c-format
msgid "GdaServerOperation: file '%s' does not conform to DTD"
msgstr "GdaServerOperation：文件 '%s' 不符合 DTD"
-#: ../libgda/gda-server-operation.c:715
+#: ../libgda/gda-server-operation.c:786
msgid "GdaServerOperation specification does not conform to DTD\n"
msgstr "GdaServerOperation 规范不符合 DTD\n"
-#: ../libgda/gda-server-operation.c:1265
+#: ../libgda/gda-server-operation.c:1347
+#, fuzzy
+#| msgid ""
+#| "Non handled GdaServerOperationType, please report error to http://";
+#| "bugzilla.gnome.org/ for the \"libgda\" product"
msgid ""
-"Non handled GdaServerOperationType, please report error to http://bugzilla.";
-"gnome.org/ for the \"libgda\" product"
+"Non handled GdaServerOperationType, please report error to http://gitlab.";
+"gnome.org/GNOME/libgda/issues"
msgstr ""
"未处理的 GdaServerOperationType，请向 http://bugzilla.gnome.org/ 报告 "
"“libgda”产品的缺陷"
-#: ../libgda/gda-server-operation.c:1500 ../libgda/gda-server-operation.c:1515
+#: ../libgda/gda-server-operation.c:1612 ../libgda/gda-server-operation.c:1627
#, c-format
msgid "Expected tag <%s>, got <%s>"
msgstr "期望标记 <%s>，然而获得了 <%s>"
-#: ../libgda/gda-server-operation.c:1549 ../libgda/gda-server-operation.c:2268
+#: ../libgda/gda-server-operation.c:1661 ../libgda/gda-server-operation.c:2283
msgid ""
"Parameterlist values can only be set for individual parameters within it"
msgstr "变量列表只能设置其中独立变量的值"
-#: ../libgda/gda-server-operation.c:1607
+#: ../libgda/gda-server-operation.c:1719
msgid "Missing attribute named 'path'"
msgstr "丢失名为 'path' 的属性"
-#: ../libgda/gda-server-operation.c:2460
+#: ../libgda/gda-server-operation.c:2480
#, c-format
msgid "Missing required value for '%s'"
msgstr "丢失 '%s' 必须的值"
-#: ../libgda/gda-server-operation.c:2689
-msgid "Unspecified table name"
-msgstr "未指定的表名"
-
-#: ../libgda/gda-server-operation.c:2729
-msgid "Invalid type"
-msgstr "无效类型"
-
-#: ../libgda/gda-server-operation.c:2834
-msgid "CREATE TABLE operation is not supported by the database server"
-msgstr "数据库服务器不支持 CREATE TABLE 操作"
+#: ../libgda/gda-server-operation.c:2629
+msgid ""
+"Could not find operation's associated provider, did you use "
+"gda_server_operation_prepare_create_database() ?"
+msgstr ""
-#: ../libgda/gda-server-provider.c:973
+#: ../libgda/gda-server-provider.c:1021
#, c-format
msgid "Provider %s created a GdaServerOperation without node for '%s'"
msgstr "提供者 %s 已创建了一个 GdaServerOperation，但 '%s' 没有节点"
-#: ../libgda/gda-server-provider.c:977
+#: ../libgda/gda-server-provider.c:1025
#, c-format
msgid "Provider %s created a GdaServerOperation with wrong node type for '%s'"
msgstr "提供者 %s 已创建了一个 GdaServerProvider，但 '%s' 的节点类型错误"
-#: ../libgda/gda-server-provider.c:2138
+#. CNC UNLOCK
+#: ../libgda/gda-server-provider.c:1508
+#, fuzzy
+#| msgid "Internal error: the \"prepared-stmt\" property has not been set"
+msgid ""
+"Internal error: connection reported as opened, yet no provider's data has "
+"been setted"
+msgstr "内部错误：“prepared-stmt”属性未设置"
+
+#: ../libgda/gda-server-provider.c:2092
+#, fuzzy, c-format
+#| msgid "Can't open connection %d: %s\n"
+msgid "Delaying opening connection for %u ms\n"
+msgstr "无法打开连接 %d：%s\n"
+
+#: ../libgda/gda-server-provider.c:2206
msgid ""
"You need to define a GMainContext using gda_connection_set_main_context()"
msgstr "您需要使用 gda_connection_set_main_context() 定义一个 GMainContext"
-#: ../libgda/gda-server-provider.c:2715 ../libgda/gda-server-provider.c:2727
-#: ../libgda/gda-server-provider.c:2739 ../libgda/gda-server-provider.c:2751
-#: ../libgda/gda-server-provider.c:2763
-#: ../providers/web/gda-web-provider.c:642
-#: ../providers/web/gda-web-provider.c:671
+#: ../libgda/gda-server-provider.c:2318
+#, fuzzy, c-format
+#| msgid "Can't close connection: %s\n"
+msgid "Delaying closing connection for %u ms\n"
+msgstr "无法关闭连接：%s\n"
+
+#: ../libgda/gda-server-provider.c:2521
+#, c-format
+msgid "Delaying statement execution for %u ms\n"
+msgstr ""
+
+#: ../libgda/gda-server-provider.c:2829 ../libgda/gda-server-provider.c:2841
+#: ../libgda/gda-server-provider.c:2853 ../libgda/gda-server-provider.c:2865
+#: ../libgda/gda-server-provider.c:2877 ../libgda/gda-server-provider.c:2889
+#: ../providers/web/gda-web-provider.c:594
+#: ../providers/web/gda-web-provider.c:623
msgid "Not supported"
msgstr "不支持"
-#: ../libgda/gda-server-provider.c:3165 ../libgda/gda-server-provider.c:3232
-#: ../libgda/gda-server-provider.c:3298
-#| msgid "Data model does not support random access"
+#: ../libgda/gda-server-provider.c:2980
+#, fuzzy, c-format
+#| msgid ""
+#| "Internal error, please report error to http://bugzilla.gnome.org/ for the "
+#| "\"libgda\" product"
+msgid ""
+"Internal error please report bug to https://gitlab.gnome.org/GNOME/libgda/";
+"issues Reported error is: %s"
+msgstr "内部错误，请向 http://bugzilla.gnome.org/ 报告“libgda”产品的错误"
+
+#: ../libgda/gda-server-provider.c:2984
+#, fuzzy, c-format
+#| msgid ""
+#| "Internal error, please report error to http://bugzilla.gnome.org/ for the "
+#| "\"libgda\" product"
+msgid ""
+"Internal error please report bug to https://gitlab.gnome.org/GNOME/libgda/";
+"issues No error was reported"
+msgstr "内部错误，请向 http://bugzilla.gnome.org/ 报告“libgda”产品的错误"
+
+#: ../libgda/gda-server-provider.c:3409 ../libgda/gda-server-provider.c:3479
+#: ../libgda/gda-server-provider.c:3548
+#, fuzzy, c-format
+#| msgid "Error starting transaction: %s"
+msgid "Delaying transaction for %u ms\n"
+msgstr "启动事务出错：%s"
+
+#: ../libgda/gda-server-provider.c:3418 ../libgda/gda-server-provider.c:3488
+#: ../libgda/gda-server-provider.c:3557
msgid "Database provider does not support transactions"
msgstr "数据库提供者不支持事务"
-#: ../libgda/gda-server-provider.c:3357 ../libgda/gda-server-provider.c:3415
-#: ../libgda/gda-server-provider.c:3473
-#| msgid "Data model does not support setting values"
+#: ../libgda/gda-server-provider.c:3619 ../libgda/gda-server-provider.c:3680
+#: ../libgda/gda-server-provider.c:3741
msgid "Database provider does not support savepoints"
msgstr "数据库提供者不支持保存点"
-#: ../libgda/gda-server-provider.c:3559 ../libgda/gda-server-provider.c:3570
-#: ../libgda/gda-server-provider.c:3581 ../libgda/gda-server-provider.c:3592
-#: ../libgda/gda-server-provider.c:3603 ../libgda/gda-server-provider.c:3614
-#| msgid "Connection does not support distributed transaction"
+#: ../libgda/gda-server-provider.c:3819
+#, c-format
+msgid "Delaying distributed transaction for %u ms\n"
+msgstr ""
+
+#: ../libgda/gda-server-provider.c:3830 ../libgda/gda-server-provider.c:3841
+#: ../libgda/gda-server-provider.c:3852 ../libgda/gda-server-provider.c:3863
+#: ../libgda/gda-server-provider.c:3874 ../libgda/gda-server-provider.c:3885
msgid "Database provider does not support distributed transactions"
msgstr "数据库提供者不支持分布式事务"
-#: ../libgda/gda-set.c:1175 ../libgda/gda-set.c:1280
+#: ../libgda/gda-set.c:1149 ../libgda/gda-set.c:1254
#, c-format
msgid "%s() does not handle values of type '%s'."
msgstr "%s() 不处理类型 '%s' 的值。"
-#: ../libgda/gda-set.c:1230
+#: ../libgda/gda-set.c:1204
#, c-format
msgid "GdaHolder with ID '%s' not found in set"
msgstr "ID 为 '%s' 的 GdaHolder 没有在集合中找到"
-#: ../libgda/gda-set.c:1414
+#: ../libgda/gda-set.c:1371
+#, 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-set.c:1419
#, c-format
msgid "Spec's root node != 'data-set-spec': '%s'"
msgstr "规范的根节点 != “data-set-spec”：“%s”"
-#: ../libgda/gda-set.c:1453
+#: ../libgda/gda-set.c:1458
#, c-format
msgid "Missing node <parameters>: '%s'"
msgstr "丢失节点 <parameters>：'%s'"
-#: ../libgda/gda-set.c:1674
+#: ../libgda/gda-set.c:1673
msgid "Data set does not allow modifications"
msgstr "数据集合不支持修改"
-#: ../libgda/gda-set.c:1935
+#: ../libgda/gda-set.c:1952
msgid "GdaHolder needs to have an ID"
msgstr "GdaHolder 需要有一个 ID"
-#: ../libgda/gda-set.c:2041
+#: ../libgda/gda-set.c:2061
msgid "One or more values are invalid"
msgstr "一个或多个值是非法的"
-#: ../libgda/gda-set.c:2290 ../libgda/gda-set.c:2303
+#: ../libgda/gda-set.c:2379 ../libgda/gda-set.c:2392
msgid ""
"Replacing data model must have the same characteristics as the data model it "
"replaces"
msgstr "用于替换的数据模型必需与它所替换的数据模型具有相同的特征"
-#: ../libgda/gda-sql-builder.c:297 ../libgda/gda-sql-builder.c:1397
+#: ../libgda/gda-sql-builder.c:241 ../libgda/gda-sql-builder.c:1401
#, c-format
msgid "Unknown part ID %u"
msgstr "未知部件(part) ID %u"
-#: ../libgda/gda-sql-builder.c:301
+#: ../libgda/gda-sql-builder.c:246
msgid "Unknown part type"
msgstr "未知部件(part)类型"
-#: ../libgda/gda-sql-builder.c:345
+#: ../libgda/gda-sql-builder.c:296
msgid "SqlBuilder is empty"
msgstr "SqlBuilder 为空"
-#: ../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
+#: ../libgda/gda-sql-builder.c:377 ../libgda/gda-sql-builder.c:440
+#: ../libgda/gda-sql-builder.c:471 ../libgda/gda-sql-builder.c:598
+#: ../libgda/gda-sql-builder.c:641 ../libgda/gda-sql-builder.c:705
+#: ../libgda/gda-sql-builder.c:776 ../libgda/gda-sql-builder.c:1157
+#: ../libgda/gda-sql-builder.c:1246 ../libgda/gda-sql-builder.c:1293
+#: ../libgda/gda-sql-builder.c:1383 ../libgda/gda-sql-builder.c:1435
+#: ../libgda/gda-sql-builder.c:1478 ../libgda/gda-sql-builder.c:1529
+#: ../libgda/gda-sql-builder.c:1584 ../libgda/gda-sql-builder.c:1621
+#: ../libgda/gda-sql-builder.c:1799 ../libgda/gda-sql-builder.c:1826
+#: ../libgda/gda-sql-builder.c:1862
msgid "Wrong statement type"
msgstr "错误的语句类型"
-#: ../libgda/gda-sql-builder.c:601
+#: ../libgda/gda-sql-builder.c:568
#, c-format
msgid "Could not convert value to type '%s', value not defined"
msgstr "无法将值转换为“%s”类型，值没有定义"
-#: ../libgda/gda-sql-builder.c:1310
+#: ../libgda/gda-sql-builder.c:1314
#, c-format
msgid "Unknown left part target ID %u"
msgstr "未知的左侧部件(part)目标 ID %u"
-#: ../libgda/gda-sql-builder.c:1315
+#: ../libgda/gda-sql-builder.c:1319
#, c-format
msgid "Unknown right part target ID %u"
msgstr "未知的右侧部件(part)目标 ID %u"
-#: ../libgda/gda-statement.c:499
+#: ../libgda/gda-statement.c:453
#, c-format
msgid "Could not determine GType for parameter '%s'"
msgstr "无法为参数 '%s' 确定 GType"
-#: ../libgda/gda-statement.c:500
+#: ../libgda/gda-statement.c:454
msgid "Unnamed"
msgstr "未命名的"
-#: ../libgda/gda-statement.c:519
+#: ../libgda/gda-statement.c:473
#, c-format
msgid "Can't handle default value of type '%s'"
msgstr "无法处理“%s”的默认值"
-#: ../libgda/gda-statement.c:776
+#: ../libgda/gda-statement.c:734
msgid "Missing SQL code"
msgstr "丢失 SQL 代码"
-#: ../libgda/gda-statement.c:796
+#: ../libgda/gda-statement.c:756
#, c-format
msgid "No data handler for type '%s'"
msgstr "没有类型 '%s' 的数据处理程序"
-#: ../libgda/gda-statement.c:1377
+#: ../libgda/gda-statement.c:1339
#, c-format
msgid "Wrong parameter type for '%s': expected type '%s' and got '%s'"
msgstr "'%s' 错误的参数类型：期望类型 '%s' 然而获得了 '%s'"
-#: ../libgda/gda-statement.c:1389
+#: ../libgda/gda-statement.c:1351
#, c-format
msgid "Missing parameter '%s'"
msgstr "丢失参数 '%s'"
-#: ../libgda/gda-statement.c:1401 ../libgda/sqlite/gda-sqlite-provider.c:3091
-#: ../providers/jdbc/gda-jdbc-provider.c:1488
-#: ../providers/mysql/gda-mysql-provider.c:2307
-#: ../providers/postgres/gda-postgres-provider.c:2107
-#: ../providers/web/gda-web-provider.c:1518
+#: ../libgda/gda-statement.c:1363 ../libgda/sqlite/gda-sqlite-provider.c:3477
+#: ../providers/jdbc/gda-jdbc-provider.c:1493
+#: ../providers/mysql/gda-mysql-provider.c:2249
+#: ../providers/postgres/gda-postgres-provider.c:2060
+#: ../providers/web/gda-web-provider.c:1468
#, c-format
msgid "Parameter '%s' is invalid"
msgstr "参数 '%s' 无效"
-#: ../libgda/gda-statement.c:1447
+#: ../libgda/gda-statement.c:1409
msgid "Unnamed parameter"
msgstr "未命名的参数"
-#: ../libgda/gda-statement.c:1723
+#: ../libgda/gda-statement.c:1690
msgid "Malformed table name"
msgstr "错误的表名"
-#: ../libgda/gda-statement.c:2221
+#: ../libgda/gda-statement.c:2188
msgid "Join is not in a FROM statement"
msgstr "Join 不在 FROM 语句中"
-#: ../libgda/gda-statement.c:2228
+#: ../libgda/gda-statement.c:2195
msgid "Could not find target the join is for"
msgstr "找不到联合(join)的目标"
-#: ../libgda/gda-tree.c:175
+#: ../libgda/gda-tree.c:172
msgid "Tells if the GdaTree is a list or a tree"
msgstr "如果 GdaTree 是列表或树时，则声明"
-#: ../libgda/gda-tree.c:769 ../libgda/gda-tree.c:777
+#: ../libgda/gda-tree.c:716 ../libgda/gda-tree.c:724
#, c-format
msgid "Path format error: %s"
msgstr "路径格式错误：%s"
-#: ../libgda/gda-tree-mgr-columns.c:302 ../libgda/gda-tree-mgr-schemas.c:255
-#: ../libgda/gda-tree-mgr-tables.c:287
+#: ../libgda/gda-tree-mgr-columns.c:268 ../libgda/gda-tree-mgr-schemas.c:214
+#: ../libgda/gda-tree-mgr-tables.c:253
msgid "No connection and no GdaMetaStore specified"
msgstr "没有指定连接或 GdaMetaStore"
-#: ../libgda/gda-tree-mgr-columns.c:388
+#: ../libgda/gda-tree-mgr-columns.c:354
msgid "No schema specified"
msgstr "没有指定方案"
-#: ../libgda/gda-tree-mgr-columns.c:396
+#: ../libgda/gda-tree-mgr-columns.c:362
msgid "No table specified"
msgstr "没有指定表"
-#: ../libgda/gda-tree-mgr-columns.c:425
+#: ../libgda/gda-tree-mgr-columns.c:390
msgid "Unable to get column name"
msgstr "无法获取列名"
-#: ../libgda/gda-tree-mgr-label.c:212
+#: ../libgda/gda-tree-mgr-label.c:177
#: ../tools/browser/canvas/browser-canvas-table.c:315
msgid "No name"
msgstr "无名称"
-#: ../libgda/gda-tree-mgr-ldap.c:242
-#: ../tools/browser/ldap-browser/mgr-ldap-classes.c:186
-#: ../tools/browser/ldap-browser/mgr-ldap-classes.c:274
-#, c-format
-msgid "No LDAP connection specified"
-msgstr "没有指定 LDAP 连接"
-
-#: ../libgda/gda-tree-mgr-schemas.c:310
+#: ../libgda/gda-tree-mgr-schemas.c:268
msgid "Unable to get schema name"
msgstr "无法获得方案名"
-#: ../libgda/gda-tree-mgr-select.c:186
+#: ../libgda/gda-tree-mgr-select.c:141
#, c-format
msgid "Could not get SELECT statement's parameters: %s"
msgstr "无法获得 SELECT 语句的参数：%s"
-#: ../libgda/gda-tree-mgr-select.c:219
+#: ../libgda/gda-tree-mgr-select.c:173
#, c-format
msgid ""
"Could not bind SELECT statement's parameter '%s' to provided parameters: %s"
msgstr "无法绑定 SELECT 语句的参数 '%s' 到提供者参数：%s"
-#: ../libgda/gda-tree-mgr-select.c:300
-#: ../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:3081 ../tools/gda-sql.c:4881
-#: ../tools/gda-sql.c:5033 ../tools/gda-sql.c:5130 ../tools/gda-sql.c:5223
-#: ../tools/gda-sql.c:5318
+#: ../libgda/gda-tree-mgr-select.c:254
+#: ../libgda-report/engine/gda-report-engine.c:592
+#: ../libgda-report/engine/gda-report-engine.c:619 ../tools/common/t-app.c:2976
+#: ../tools/common/t-app.c:4669 ../tools/common/t-app.c:5186
+#: ../tools/common/t-app.c:5287 ../tools/common/t-app.c:5384
+#: ../tools/common/t-app.c:5482 ../tools/common/t-context.c:269
+#: ../tools/common/t-context.c:421
#, c-format
msgid "No connection specified"
msgstr "没有指定连接"
-#: ../libgda/gda-tree-mgr-select.c:308
+#: ../libgda/gda-tree-mgr-select.c:262
msgid "No SELECT statement specified"
msgstr "没有指定 SELECT 语句"
-#: ../libgda/gda-tree-mgr-select.c:330
+#: ../libgda/gda-tree-mgr-select.c:284
#, c-format
msgid "No value specified for parameter '%s'"
msgstr "没有为参数 '%s' 指定值"
-#: ../libgda/gda-tree-mgr-select.c:364
+#: ../libgda/gda-tree-mgr-select.c:317
msgid "Unable to get iterator's value"
msgstr "无法获得迭代器的值"
-#: ../libgda/gda-tree-mgr-tables.c:391
+#: ../libgda/gda-tree-mgr-tables.c:356
msgid "Unable to get table name"
msgstr "无法获得表名"
-#: ../libgda/gda-util.c:701
+#: ../libgda/gda-util.c:707
#, c-format
msgid "Field number %d not found in source named '%s'"
msgstr "字段名 %d 没有在名为 '%s' 的源中找到"
-#: ../libgda/gda-util.c:886
+#: ../libgda/gda-util.c:882
msgid "SELECT statement has no FROM part"
msgstr "选择语句没有 FROM 部分"
-#: ../libgda/gda-util.c:891 ../libgda/gda-util.c:898
+#: ../libgda/gda-util.c:887 ../libgda/gda-util.c:894
msgid "SELECT statement involves more than one table or expression"
msgstr "SELECT 语句影响超过一个的表或表达式"
-#: ../libgda/gda-util.c:908
+#: ../libgda/gda-util.c:904
msgid "Can only build modification statement for tables"
msgstr "只能为表构建修改语句"
-#: ../libgda/gda-util.c:948
+#: ../libgda/gda-util.c:944
msgid "Table does not have any primary key"
msgstr "表没有任何主键"
-#: ../libgda/gda-util.c:977
+#: ../libgda/gda-util.c:973
msgid "Table's primary key is not part of SELECT"
msgstr "表的主键不是 SELECT 的一部分"
-#: ../libgda/gda-util.c:1028
+#: ../libgda/gda-util.c:1024
msgid "Table does not have any column"
msgstr "表中没有任何列"
-#: ../libgda/gda-util.c:1054
+#: ../libgda/gda-util.c:1050
#, c-format
msgid "Table's column '%s' is not part of SELECT"
msgstr "表列“%s”不是 SELECT 的一部分"
-#: ../libgda/gda-util.c:1310
+#. To translators: this error message occurs when no "INSERT INTO <table> (field1, ...)..."
+#. * SQL statement can be computed because no table field can be used
+#: ../libgda/gda-util.c:1306
msgid "Could not compute any field to insert into"
msgstr "无法计算任何要插入到的字段"
-#: ../libgda/gda-util.c:1373
+#: ../libgda/gda-util.c:1369
msgid "Missing table name in UPDATE statement"
msgstr "UPDATE 语句中丢失表名"
-#: ../libgda/gda-util.c:1728
+#: ../libgda/gda-util.c:1723
msgid "Can't rewrite UPDATE statement to handle default values"
msgstr "无法重写 UPDATE 语句来处理默认值"
-#: ../libgda/gda-util.c:1736
+#: ../libgda/gda-util.c:1731
msgid "Can't rewrite statement which is not INSERT or UPDATE"
msgstr "无法重写除 INSERT 或 UPDATE 外的语句"
-#: ../libgda/gda-util.c:1780 ../libgda/gda-util.c:1837
-#: ../libgda/gda-util.c:1877 ../libgda/sqlite/gda-sqlite-provider.c:3072
-#: ../providers/jdbc/gda-jdbc-provider.c:1459
-#: ../providers/mysql/gda-mysql-provider.c:2287
-#: ../providers/postgres/gda-postgres-provider.c:2089
-#: ../providers/web/gda-web-provider.c:1500
+#: ../libgda/gda-util.c:1775 ../libgda/gda-util.c:1832
+#: ../libgda/gda-util.c:1872 ../libgda/sqlite/gda-sqlite-provider.c:3458
+#: ../providers/jdbc/gda-jdbc-provider.c:1464
+#: ../providers/mysql/gda-mysql-provider.c:2229
+#: ../providers/postgres/gda-postgres-provider.c:2042
+#: ../providers/web/gda-web-provider.c:1450
#, c-format
msgid "Missing parameter '%s' to execute query"
msgstr "要执行查询，丢失参数 '%s'"
-#: ../libgda/gda-util.c:3067
+#: ../libgda/gda-util.c:3040
msgid "The 'first', 'second' and 'third' arguments must be different"
msgstr "“first”、“second”和“third”参数必须不同"
-#: ../libgda/gda-util.c:3072
+#: ../libgda/gda-util.c:3045
#, c-format
msgid "Invalid separator '%c'"
msgstr "无效的分隔符“%c”"
-#: ../libgda/gda-util.c:3074
+#: ../libgda/gda-util.c:3047
msgid "Invalid null separator"
msgstr "无效的空分隔符"
-#: ../libgda/gda-util.c:3112 ../libgda/gda-util.c:3127
-#: ../libgda/gda-util.c:3142
+#: ../libgda/gda-util.c:3085 ../libgda/gda-util.c:3100
+#: ../libgda/gda-util.c:3115
#, c-format
msgid "Unknown GDateDMY value %u"
msgstr "未知 GDateDMY 值 %u"
-#: ../libgda/gda-xa-transaction.c:163
+#: ../libgda/gda-xa-transaction.c:164
msgid "Global transaction ID can not have more than 64 bytes"
msgstr "全局事务标识不能超过 64 字节"
-#: ../libgda/gda-xa-transaction.c:290
+#: ../libgda/gda-xa-transaction.c:266
msgid "Connection branch cannot exceed 63 bytes"
msgstr "连接分支不能超过 63 字节"
-#: ../libgda/gda-xa-transaction.c:307
+#: ../libgda/gda-xa-transaction.c:282
msgid "Connection already registered with another GdaXaTransaction object"
msgstr "连接已经注册到另一个 GdaXaTransaction 对象"
-#: ../libgda/gda-xa-transaction.c:321
+#: ../libgda/gda-xa-transaction.c:296
msgid "Connection does not support distributed transaction"
msgstr "连接不支持分布式事务"
-#: ../libgda/gda-xa-transaction.c:354
+#: ../libgda/gda-xa-transaction.c:329
msgid ""
"Cannot unregister connection not registered with GdaXaTransaction object"
msgstr "无法解除注册不是使用 GdaXaTransaction 对象注册的连接"
-#: ../libgda/handlers/gda-handler-bin.c:127
+#: ../libgda/handlers/gda-handler-bin.c:202
msgid "Binary representation"
msgstr "二进制表示"
-#: ../libgda/handlers/gda-handler-boolean.c:122
+#: ../libgda/handlers/gda-handler-boolean.c:138
msgid "Boolean representation"
msgstr "布尔型表示"
-#: ../libgda/handlers/gda-handler-numerical.c:137
+#: ../libgda/handlers/gda-handler-numerical.c:312
msgid "Numerical representation"
msgstr "数值表示"
-#: ../libgda/handlers/gda-handler-string.c:122
-msgid "InternalString"
-msgstr "内部字符串"
-
-#: ../libgda/handlers/gda-handler-string.c:123
+#: ../libgda/handlers/gda-handler-string.c:204
msgid "Strings representation"
msgstr "字符串类型表示"
-#: ../libgda/handlers/gda-handler-time.c:175
+#: ../libgda/handlers/gda-handler-text.c:207
+#, fuzzy
+#| msgid "Strings representation"
+msgid "Large String representation"
+msgstr "字符串类型表示"
+
+#. To translators: DD represents a place holder in a date string. For example in the "YYYY-MM-DD" format,
one knows that she has to replace DD by a day number
+#: ../libgda/handlers/gda-handler-time.c:475
+msgid "DD"
+msgstr ""
+
+#. To translators: MM represents a place holder in a date string. For example in the "YYYY-MM-DD" format,
one knows that she has to replace MM by a month number
+#: ../libgda/handlers/gda-handler-time.c:479
+msgid "MM"
+msgstr ""
+
+#. To translators: YY represents a place holder in a date string. For example in the "YY-MM-DD" format, one
knows that she has to replace YY by a year number, on 2 digits
+#: ../libgda/handlers/gda-handler-time.c:484
+msgid "YY"
+msgstr ""
+
+#. To translators: YYYY represents a place holder in a date string. For example in the "YYYY-MM-DD" format,
one knows that she has to replace YYYY by a year number, on 4 digits
+#: ../libgda/handlers/gda-handler-time.c:487
+msgid "YYYY"
+msgstr ""
+
+#: ../libgda/handlers/gda-handler-time.c:556
+msgid ""
+"Time data handler can create an SQL representation of a value not holding "
+"time type."
+msgstr ""
+
+#: ../libgda/handlers/gda-handler-time.c:1064
msgid "Time, Date and TimeStamp representation"
msgstr "时间、日期和时间戳表示"
-#: ../libgda/handlers/gda-handler-type.c:119
+#: ../libgda/handlers/gda-handler-type.c:152
msgid "Gda type representation"
msgstr "Gda 类型表示"
-#: ../libgda-report/DocBook/gda-report-docbook-document.c:286
-#: ../libgda-report/DocBook/gda-report-docbook-document.c:355
-#: ../libgda-report/RML/gda-report-rml-document.c:210
-#: ../libgda-report/RML/gda-report-rml-document.c:241
+#: ../libgda-report/DocBook/gda-report-docbook-document.c:267
+#: ../libgda-report/DocBook/gda-report-docbook-document.c:336
+#: ../libgda-report/RML/gda-report-rml-document.c:155
+#: ../libgda-report/RML/gda-report-rml-document.c:186
#, c-format
msgid "Could not find the '%s' program"
msgstr "无法找到 '%s' 程序"
-#: ../libgda-report/DocBook/gda-report-docbook-document.c:301
+#: ../libgda-report/DocBook/gda-report-docbook-document.c:282
msgid "Could not find the DocBook XSL stylesheet for HTML"
msgstr "无法为 HTML 找到 DocBook XSL 样式表"
-#: ../libgda-report/DocBook/gda-report-docbook-document.c:369
+#: ../libgda-report/DocBook/gda-report-docbook-document.c:350
msgid "Could not find the DocBook XSL stylesheet for Formatting Objects"
msgstr "无法为格式化对象找到 DocBook XSL 样式表"
-#: ../libgda-report/engine/gda-report-engine.c:336
+#: ../libgda-report/engine/gda-report-engine.c:314
#, c-format
msgid "Object type '%s' cannot be declared in this context"
msgstr "对象类型 '%s' 不能在此上下文中声明"
-#: ../libgda-report/engine/gda-report-engine.c:344
+#: ../libgda-report/engine/gda-report-engine.c:322
#, c-format
msgid "An object with the '%s' name has already been declared"
msgstr "一个名为 '%s' 的对象有一个已经声明的对象"
-#: ../libgda-report/engine/gda-report-engine.c:379
+#: ../libgda-report/engine/gda-report-engine.c:357
#, c-format
msgid "Object type '%s' cannot be requested in this context"
msgstr "不能在此上下文中请求对象类型 '%s'"
-#: ../libgda-report/engine/gda-report-engine.c:598
+#: ../libgda-report/engine/gda-report-engine.c:576
#, c-format
msgid "Unknown query '%s'"
msgstr "未知的查询 '%s'"
-#: ../libgda-report/engine/gda-report-engine.c:609
-#: ../libgda-report/engine/gda-report-engine.c:636 ../tools/gda-sql.c:2856
-#: ../tools/gda-sql.c:3092
+#: ../libgda-report/engine/gda-report-engine.c:587
+#: ../libgda-report/engine/gda-report-engine.c:614 ../tools/common/t-app.c:2780
+#: ../tools/common/t-app.c:2990
#, c-format
msgid "No connection named '%s' found"
msgstr "没有找到名为 '%s' 的连接"
-#: ../libgda-report/engine/gda-report-engine.c:681
+#: ../libgda-report/engine/gda-report-engine.c:659
msgid "Query is not specified (not named and not defined)"
msgstr "查询没有指定 (未命名且未定义)"
-#: ../libgda-report/engine/gda-report-engine.c:846
-#: ../libgda-report/engine/gda-report-engine.c:997
-#: ../libgda-report/engine/gda-report-engine.c:1054
+#: ../libgda-report/engine/gda-report-engine.c:824
+#: ../libgda-report/engine/gda-report-engine.c:975
+#: ../libgda-report/engine/gda-report-engine.c:1032
#, c-format
msgid "Unknown parameter '%s'"
msgstr "未知的参数 '%s'"
-#: ../libgda-report/engine/gda-report-engine.c:872
+#: ../libgda-report/engine/gda-report-engine.c:850
msgid "Parameter name not specified"
msgstr "参数名未指定"
-#: ../libgda-report/engine/gda-report-engine.c:922
+#: ../libgda-report/engine/gda-report-engine.c:900
msgid "No expression specified"
msgstr "没有指定的表达式"
-#: ../libgda-report/engine/gda-report-engine.c:945
+#: ../libgda-report/engine/gda-report-engine.c:923
#, c-format
msgid "Cannot cast value from type '%s' to type '%s'"
msgstr "无法将值从“%s”类型转换为“%s”类型"
-#: ../libgda-report/engine/gda-report-engine.c:1083
+#: ../libgda-report/engine/gda-report-engine.c:1061
#, c-format
msgid "Cannot cast parameter from type '%s' to type '%s'"
msgstr "无法将参数从“%s”类型转换为“%s”类型"
-#: ../libgda-report/engine/gda-report-engine.c:1176
+#: ../libgda-report/engine/gda-report-engine.c:1154
#, c-format
msgid "Expression '%s' should return exactly one value"
msgstr "表达式 '%s' 返回且只返回一个值"
-#: ../libgda-report/engine/gda-report-engine.c:1216
+#: ../libgda-report/engine/gda-report-engine.c:1194
msgid "Binary data"
msgstr "二进制数据"
-#: ../libgda-report/engine/rt-parser.c:1222
-#: ../libgda-report/engine/rt-parser.c:1428
+#: ../libgda-report/engine/rt-parser.c:1235
+#: ../libgda-report/engine/rt-parser.c:1449
msgid "link"
msgstr "链接"
-#: ../libgda-report/gda-report-document.c:255
+#: ../libgda-report/gda-report-document.c:228
msgid "Document not specified"
msgstr "文档未指定"
-#: ../libgda-report/gda-report-document.c:282
+#: ../libgda-report/gda-report-document.c:255
msgid "Cannot create temporary file"
msgstr "无法创建临时文件"
-#: ../libgda-report/gda-report-document.c:309
+#: ../libgda-report/gda-report-document.c:282
#, c-format
msgid "Execution of the %s program failed: %s"
msgstr "执行 %s 程序失败：%s"
-#: ../libgda-report/gda-report-document.c:347
-#: ../libgda-report/gda-report-document.c:372
+#: ../libgda-report/gda-report-document.c:320
+#: ../libgda-report/gda-report-document.c:344
#, c-format
msgid "This report document does not handle %s output"
msgstr "报告文档不处理 %s 输出"
-#: ../libgda/sqlite/gda-sqlite-ddl.c:222 ../providers/jdbc/gda-jdbc-ddl.c:142
-#: ../providers/mysql/gda-mysql-ddl.c:336
-#: ../providers/oracle/gda-oracle-ddl.c:142
-#: ../providers/postgres/gda-postgres-ddl.c:378
-#: ../providers/web/gda-web-ddl.c:141
-msgid "Table to create must have at least one row"
+#: ../libgda/sqlite/gda-sqlite-ddl.c:68
+#, fuzzy
+#| msgid "Internal error: invalid provider handle"
+msgid "Internal error, creating table in SQLite provider"
+msgstr "内部错误：无效的提供者句柄"
+
+#: ../libgda/sqlite/gda-sqlite-ddl.c:84
+msgid "No fields are defined for CREATE TABLE operation"
+msgstr ""
+
+#: ../libgda/sqlite/gda-sqlite-ddl.c:274 ../providers/mysql/gda-mysql-ddl.c:277
+#: ../providers/postgres/gda-postgres-ddl.c:305
+msgid "No field specified in foreign key constraint"
+msgstr "在外键约束中没有指定字段"
+
+#: ../libgda/sqlite/gda-sqlite-ddl.c:363
+#, fuzzy
+#| msgid "Table to create must have at least one row"
+msgid "Table to create must have at least one field"
msgstr "要创建的表必须至少有一行"
-#: ../libgda/sqlite/gda-sqlite-handler-bin.c:119
+#: ../libgda/sqlite/gda-sqlite-handler-bin.c:77
msgid "SQLite binary representation"
msgstr "SQLite 二进制表示"
-#: ../libgda/sqlite/gda-sqlite-handler-boolean.c:117
+#: ../libgda/sqlite/gda-sqlite-handler-boolean.c:74
msgid "Sqlite boolean representation"
msgstr "Sqlite 布尔型表示"
# 怀疑此处 is 是 in
-#: ../libgda/sqlite/gda-sqlite-provider.c:119
-#: ../libgda/sqlite/gda-sqlite-provider.c:177
-#, c-format
-msgid "Parameter '%s' not found is statement"
+#: ../libgda/sqlite/gda-sqlite-provider.c:129
+#, fuzzy, c-format
+#| msgid "Parameter '%s' not found is statement"
+msgid "Parameter '%s' not found in statement"
msgstr "语句中没有找到参数“%s”"
-#: ../libgda/sqlite/gda-sqlite-provider.c:133
-#: ../libgda/sqlite/gda-sqlite-provider.c:149
-#: ../libgda/sqlite/gda-sqlite-provider.c:191
-#: ../libgda/sqlite/gda-sqlite-provider.c:207
+#: ../libgda/sqlite/gda-sqlite-provider.c:143
+#: ../libgda/sqlite/gda-sqlite-provider.c:159
+#: ../libgda/sqlite/gda-sqlite-provider.c:201
+#: ../libgda/sqlite/gda-sqlite-provider.c:217
#, c-format
msgid "No column name to associate to parameter '%s'"
msgstr "没有要与参数“%s”关联的列名"
-#: ../libgda/sqlite/gda-sqlite-provider.c:217
+# 怀疑此处 is 是 in
+#: ../libgda/sqlite/gda-sqlite-provider.c:187
+#, c-format
+msgid "Parameter '%s' not found is statement"
+msgstr "语句中没有找到参数“%s”"
+
+#: ../libgda/sqlite/gda-sqlite-provider.c:227
msgid "Binding a BLOB for this type of statement is not supported"
msgstr "不支持为语句的此类型绑定 BLOB"
-#: ../libgda/sqlite/gda-sqlite-provider.c:631
+#: ../libgda/sqlite/gda-sqlite-provider.c:957
+#, fuzzy
+#| msgid "Set to TRUE if the role is allowed to create databases"
+msgid "Set to TRUE if the provider is the internal default"
+msgstr "如果允许该角色创建数据库，设为 TRUE"
+
+#: ../libgda/sqlite/gda-sqlite-provider.c:979
msgid "Can't find libsqlite3."
msgstr "无法找到 libsqlite3。"
-#: ../libgda/sqlite/gda-sqlite-provider.c:762
-#: ../providers/mdb/gda-mdb-provider.c:276
+#: ../libgda/sqlite/gda-sqlite-provider.c:1133
+#: ../providers/mdb/gda-mdb-provider.c:275
msgid "The connection string must contain DB_DIR and DB_NAME values"
msgstr "连接字符串必须含有 DB_DIR 和 DB_NAME 值"
-#: ../libgda/sqlite/gda-sqlite-provider.c:788
-#: ../libgda/sqlite/gda-sqlite-provider.c:795
+#: ../libgda/sqlite/gda-sqlite-provider.c:1159
+#: ../libgda/sqlite/gda-sqlite-provider.c:1166
#, c-format
msgid ""
"The connection string format has changed: replace URI with DB_DIR (the path "
@@ -2555,548 +3074,543 @@ msgstr ""
"连接字符串格式已经更改：使用 DB_DIR (数据库文件的路径) 和 DB_NAME (没有结尾 "
"'%s' 的数据库文件) 替代 URI。"
-#: ../libgda/sqlite/gda-sqlite-provider.c:810
-#: ../providers/mdb/gda-mdb-provider.c:318
+#: ../libgda/sqlite/gda-sqlite-provider.c:1181
+#: ../providers/mdb/gda-mdb-provider.c:317
msgid ""
"The DB_DIR part of the connection string must point to a valid directory"
msgstr "连接字符串的 DB_DIR 部分必须指向一个合法目录"
-#: ../libgda/sqlite/gda-sqlite-provider.c:870
+#: ../libgda/sqlite/gda-sqlite-provider.c:1241
msgid "Wrong encryption passphrase"
msgstr "错误的加密口令"
-#: ../libgda/sqlite/gda-sqlite-provider.c:910
-msgid "Extension loading is not supported"
-msgstr "不支持加载扩展"
+#: ../libgda/sqlite/gda-sqlite-provider.c:1284
+msgid ""
+"SECURITY WARNING: Load Extension is enable for SQL commands, this means an "
+"attacker can access extension load capabilities"
+msgstr ""
-#: ../libgda/sqlite/gda-sqlite-provider.c:929
+#: ../libgda/sqlite/gda-sqlite-provider.c:1303
#, c-format
msgid "Could not set empty_result_callbacks SQLite option: %s"
msgstr "无法设定 empty_result_callbacks SQLite 选项：%s"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1017
-#: ../libgda/sqlite/gda-sqlite-provider.c:1036
+#: ../libgda/sqlite/gda-sqlite-provider.c:1391
+#: ../libgda/sqlite/gda-sqlite-provider.c:1411
#, c-format
msgid "Could not register function '%s'"
msgstr "无法注册函数“%s”"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1054
+#: ../libgda/sqlite/gda-sqlite-provider.c:1429
#, c-format
msgid "Could not define the %s collation"
msgstr "无法定义排序规则(collation) %s"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1205
-#: ../libgda/sqlite/gda-sqlite-provider.c:1247
-#: ../libgda-ui/data-entries/plugins/libmain.c:89
-#: ../libgda-ui/data-entries/plugins/libmain.c:126
-#: ../libgda-ui/data-entries/plugins/libmain.c:152
-#: ../libgda-ui/data-entries/plugins/libmain.c:181
-#: ../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:860
-#: ../providers/mysql/gda-mysql-provider.c:902
-#: ../providers/postgres/gda-postgres-provider.c:883
-#: ../providers/postgres/gda-postgres-provider.c:939
-#, c-format
-msgid "Missing spec. file '%s'"
-msgstr "缺少规范文件“%s”"
-
-#: ../libgda/sqlite/gda-sqlite-provider.c:1374
-#: ../libgda/sqlite/gda-sqlite-provider.c:1385
-#: ../libgda/sqlite/gda-sqlite-provider.c:1399
-#: ../libgda/sqlite/gda-sqlite-provider.c:1410
+#: ../libgda/sqlite/gda-sqlite-provider.c:1713
+#: ../libgda/sqlite/gda-sqlite-provider.c:1724
+#: ../libgda/sqlite/gda-sqlite-provider.c:1738
+#: ../libgda/sqlite/gda-sqlite-provider.c:1749
msgid "Error initializing database with passphrase"
msgstr "使用口令初始化数据库出错"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1452
+#: ../libgda/sqlite/gda-sqlite-provider.c:1791
msgid "Missing database name or directory"
msgstr "丢失数据库名或目录"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1478
-#: ../providers/postgres/gda-postgres-provider.c:1131
-#: ../providers/postgres/gda-postgres-provider.c:1132
+#: ../libgda/sqlite/gda-sqlite-provider.c:1819
+#: ../providers/postgres/gda-postgres-provider.c:1084
+#: ../providers/postgres/gda-postgres-provider.c:1085
msgid "Transactions are not supported in read-only mode"
msgstr "只读模式中不支持事务"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1873
+#: ../libgda/sqlite/gda-sqlite-provider.c:2235
msgid "SQLite does not support specifying fields to apply DISTINCT clause on"
msgstr "SQLite 不支持指定字段来应用 DISTINCT 条文(clause)"
-#: ../libgda/sqlite/gda-sqlite-provider.c:1920
-#: ../libgda/sqlite/gda-sqlite-provider.c:1930
+#: ../libgda/sqlite/gda-sqlite-provider.c:2282
+#: ../libgda/sqlite/gda-sqlite-provider.c:2292
#, c-format
msgid "'%s' compound not supported by SQLite"
msgstr "SQLite 不支持“%s”复合"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2028
+#: ../libgda/sqlite/gda-sqlite-provider.c:2394
msgid "ILIKE operation not supported"
msgstr "不支持 ILIKE 操作"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2575
-#: ../providers/jdbc/gda-jdbc-provider.c:1249
-#: ../providers/postgres/gda-postgres-provider.c:1683
-#: ../providers/web/gda-web-provider.c:1272
+#: ../libgda/sqlite/gda-sqlite-provider.c:2426
+#, fuzzy
+#| msgid "ILIKE operation not supported"
+msgid "SIMILAR operation not supported"
+msgstr "不支持 ILIKE 操作"
+
+#: ../libgda/sqlite/gda-sqlite-provider.c:2550
+#, fuzzy
+#| msgid "Operation not supported\n"
+msgid "Operator type not supported"
+msgstr "操作不支持\n"
+
+#: ../libgda/sqlite/gda-sqlite-provider.c:2956
+#: ../providers/jdbc/gda-jdbc-provider.c:1254
+#: ../providers/postgres/gda-postgres-provider.c:1639
+#: ../providers/web/gda-web-provider.c:1223
msgid "Unnamed parameter is not allowed in prepared statements"
msgstr "在准备就绪语句中不允许有未命名的参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2688
-#: ../libgda/sqlite/gda-sqlite-provider.c:2700
-#: ../providers/mysql/gda-mysql-provider.c:2029
-#: ../providers/postgres/gda-postgres-provider.c:1831
+#: ../libgda/sqlite/gda-sqlite-provider.c:3073
+#: ../libgda/sqlite/gda-sqlite-provider.c:3085
+#: ../providers/mysql/gda-mysql-provider.c:1973
+#: ../providers/postgres/gda-postgres-provider.c:1786
#, c-format
msgid "Can't build SELECT statement to get last inserted row: %s"
msgstr "无法构建 SELECT 语句以获取最后插入的行：%s"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2722
-#: ../providers/mysql/gda-mysql-provider.c:2044
-#: ../providers/postgres/gda-postgres-provider.c:1846
-#, c-format
-msgid "Can't execute SELECT statement to get last inserted row: %s"
-msgstr "无法执行 SELECT 语句以获取最新插入的行：%s"
-
-#: ../libgda/sqlite/gda-sqlite-provider.c:2735
-#: ../providers/mysql/gda-mysql-provider.c:2057
-#: ../providers/postgres/gda-postgres-provider.c:1859
+#: ../libgda/sqlite/gda-sqlite-provider.c:3119
+#: ../providers/mysql/gda-mysql-provider.c:2001
+#: ../providers/postgres/gda-postgres-provider.c:1814
msgid "SELECT statement to get last inserted row did not return any row"
msgstr "用以获取最新插入行的 SELECT 语句没有返回任何行"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2739
-#: ../providers/mysql/gda-mysql-provider.c:2061
-#: ../providers/postgres/gda-postgres-provider.c:1863
+#: ../libgda/sqlite/gda-sqlite-provider.c:3123
+#: ../providers/mysql/gda-mysql-provider.c:2005
+#: ../providers/postgres/gda-postgres-provider.c:1818
#, c-format
msgid "SELECT statement to get last inserted row returned too many (%d) rows"
msgstr "获取最新插入行的 SELECT 语句返回了过多 (%d) 的行"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2804
+#: ../libgda/sqlite/gda-sqlite-provider.c:3187
msgid "Prepared statement has no associated GdaStatement"
msgstr "准备就绪语句没有相关联的 GdaStatement"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2844
-#: ../libgda/sqlite/gda-sqlite-provider.c:2881
+#: ../libgda/sqlite/gda-sqlite-provider.c:3228
+#: ../libgda/sqlite/gda-sqlite-provider.c:3265
msgid "Can't create SQLite BLOB handle"
msgstr "无法创建 SQLite BLOB 句柄"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2848
-#: ../libgda/sqlite/gda-sqlite-provider.c:2886
+#: ../libgda/sqlite/gda-sqlite-provider.c:3232
+#: ../libgda/sqlite/gda-sqlite-provider.c:3270
msgid "Can't write to SQLite's BLOB"
msgstr "无法创建 SQLite BLOB"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2871
-#, c-format
+#: ../libgda/sqlite/gda-sqlite-provider.c:3255
+#, 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 ""
"Can't obtain SQLite BLOB handle (reported type is '%s'), please report this "
-"bug to http://bugzilla.gnome.org/ for the \"libgda\" product."
+"bug to http://gitlab.gnome.org/GNOME/libgda/issues";
msgstr ""
"无法获取 SQLite BLOB 句柄 (报告的类型是 '%s')，请在 http://bugzilla.gnome.";
"org/ 上为“libgda”产品报告这个 bug。"
-#: ../libgda/sqlite/gda-sqlite-provider.c:2896
+#: ../libgda/sqlite/gda-sqlite-provider.c:3280
msgid "Can't identify the ROWID of the blob to fill"
msgstr "无法识别要填充的 blob 的 ROWID"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3005
+#: ../libgda/sqlite/gda-sqlite-provider.c:3391
#: ../tools/browser/mgr-favorites.c:249 ../tools/browser/mgr-favorites.c:291
msgid "Empty statement"
msgstr "空语句"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3047
-#: ../libgda/sqlite/gda-sqlite-provider.c:3050
-#: ../providers/jdbc/gda-jdbc-provider.c:1425
-#: ../providers/jdbc/gda-jdbc-provider.c:1428
-#: ../providers/mysql/gda-mysql-provider.c:2262
-#: ../providers/mysql/gda-mysql-provider.c:2265
-#: ../providers/postgres/gda-postgres-provider.c:2065
-#: ../providers/postgres/gda-postgres-provider.c:2068
-#: ../providers/web/gda-web-provider.c:1474
-#: ../providers/web/gda-web-provider.c:1477
+#: ../libgda/sqlite/gda-sqlite-provider.c:3433
+#: ../libgda/sqlite/gda-sqlite-provider.c:3436
+#: ../providers/jdbc/gda-jdbc-provider.c:1430
+#: ../providers/jdbc/gda-jdbc-provider.c:1433
+#: ../providers/mysql/gda-mysql-provider.c:2204
+#: ../providers/mysql/gda-mysql-provider.c:2207
+#: ../providers/postgres/gda-postgres-provider.c:2018
+#: ../providers/postgres/gda-postgres-provider.c:2021
+#: ../providers/web/gda-web-provider.c:1424
+#: ../providers/web/gda-web-provider.c:1427
msgid "Missing parameter(s) to execute query"
msgstr "丢失要执行查询的参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3110
-#: ../providers/jdbc/gda-jdbc-provider.c:1507
-#: ../providers/mysql/gda-mysql-provider.c:2326
-#: ../providers/postgres/gda-postgres-provider.c:2126
-#: ../providers/web/gda-web-provider.c:1541
+#: ../libgda/sqlite/gda-sqlite-provider.c:3496
+#: ../providers/jdbc/gda-jdbc-provider.c:1512
+#: ../providers/mysql/gda-mysql-provider.c:2268
+#: ../providers/postgres/gda-postgres-provider.c:2079
+#: ../providers/web/gda-web-provider.c:1491
msgid "Can't rewrite statement handle default values"
msgstr "无法重写语句句柄的默认值"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3226
-#: ../providers/mysql/gda-mysql-provider.c:2590
+#: ../libgda/sqlite/gda-sqlite-provider.c:3617
+#: ../providers/mysql/gda-mysql-provider.c:2524
msgid "Can't get BLOB's length"
msgstr "无法获得 BLOB 的长度"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3228
-#: ../providers/mysql/gda-mysql-provider.c:2592
+#: ../libgda/sqlite/gda-sqlite-provider.c:3619
+#: ../providers/mysql/gda-mysql-provider.c:2526
msgid "BLOB is too big"
msgstr "BLOB 过大"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3342
+#: ../libgda/sqlite/gda-sqlite-provider.c:3704
#, c-format
msgid "Non handled data type '%s'"
msgstr "没有已处理的数据类型 '%s'"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3409
+#: ../libgda/sqlite/gda-sqlite-provider.c:3771
msgid "Could not start transaction to create BLOB"
msgstr "无法启动事务来创建 BLOB"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3574
-#: ../libgda/sqlite/gda-sqlite-provider.c:3595
-#: ../libgda/sqlite/gda-sqlite-provider.c:3686
-#: ../libgda/sqlite/gda-sqlite-provider.c:3706
-#: ../libgda/sqlite/gda-sqlite-provider.c:3729
+#: ../libgda/sqlite/gda-sqlite-provider.c:3946
+#: ../libgda/sqlite/gda-sqlite-provider.c:3967
+#: ../libgda/sqlite/gda-sqlite-provider.c:4059
+#: ../libgda/sqlite/gda-sqlite-provider.c:4079
+#: ../libgda/sqlite/gda-sqlite-provider.c:4102
msgid "Function requires one argument"
msgstr "函数要求一个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3627
-#: ../libgda/sqlite/gda-sqlite-provider.c:3761
+#: ../libgda/sqlite/gda-sqlite-provider.c:4000
+#: ../libgda/sqlite/gda-sqlite-provider.c:4134
msgid "Function requires two arguments"
msgstr "函数要求两个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3666
+#: ../libgda/sqlite/gda-sqlite-provider.c:4039
msgid "Function requires one or two arguments"
msgstr "函数要求一到两个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3801
-#: ../libgda/sqlite/gda-sqlite-provider.c:3908
+#: ../libgda/sqlite/gda-sqlite-provider.c:4174
+#: ../libgda/sqlite/gda-sqlite-provider.c:4281
msgid "Function requires two or three arguments"
msgstr "函数要求两到三个参数"
-#: ../libgda/sqlite/gda-sqlite-provider.c:3855
+#: ../libgda/sqlite/gda-sqlite-provider.c:4228
#, c-format
msgid "SQLite regexp '%s' error:"
msgstr "SQLite 正则 %s 出错："
-#: ../libgda/sqlite/gda-sqlite-provider.c:3856
+#: ../libgda/sqlite/gda-sqlite-provider.c:4229
msgid "Invalid regular expression"
msgstr "正则表达式无效"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:256
+#: ../libgda/sqlite/gda-sqlite-recordset.c:233
#: ../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:185
+#: ../providers/mysql/gda-mysql-recordset.c:472
+#: ../providers/mysql/gda-mysql-recordset.c:608
+#: ../providers/postgres/gda-postgres-recordset.c:265
+#: ../providers/web/gda-web-recordset.c:156
#, c-format
msgid "Column %d out of range (0-%d), ignoring its specified type"
msgstr "列 %d 超出范围 (0-%d)，忽略其指定的类型"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:436
-#: ../libgda/sqlite/gda-sqlite-recordset.c:449
-#: ../libgda/sqlite/gda-sqlite-recordset.c:586
-#: ../libgda/sqlite/gda-sqlite-recordset.c:599
-#: ../libgda/sqlite/gda-sqlite-recordset.c:612
-#: ../libgda/sqlite/gda-sqlite-recordset.c:625
+#: ../libgda/sqlite/gda-sqlite-recordset.c:420
+#: ../libgda/sqlite/gda-sqlite-recordset.c:433
+#: ../libgda/sqlite/gda-sqlite-recordset.c:571
+#: ../libgda/sqlite/gda-sqlite-recordset.c:584
+#: ../libgda/sqlite/gda-sqlite-recordset.c:597
+#: ../libgda/sqlite/gda-sqlite-recordset.c:610
msgid "Integer value is too big"
msgstr "整数值过大"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:515
+#: ../libgda/sqlite/gda-sqlite-recordset.c:501
msgid "Unable to open BLOB"
msgstr "无法打开 BLOB"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:536
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:673
+#: ../libgda/sqlite/gda-sqlite-recordset.c:522
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:651
#, c-format
msgid "Invalid date '%s' (date format should be YYYY-MM-DD)"
msgstr "无效的日期 '%s' (日期格式必须为 YYYY-MM-DD)"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:551
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:689
-#: ../providers/postgres/gda-postgres-recordset.c:638
-#, c-format
-msgid "Invalid time '%s' (time format should be HH:MM:SS[.ms])"
+#: ../libgda/sqlite/gda-sqlite-recordset.c:538
+#, fuzzy, c-format
+#| msgid "Invalid time '%s' (time format should be HH:MM:SS[.ms])"
+msgid "Invalid time '%s' (time format should be HH:MM:SS[.ms][+HH:mm])"
msgstr "无效的时间 '%s' (时间格式必须是 HH:MM:SS[.ms])"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:569
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:705
-#, c-format
-msgid "Invalid timestamp '%s' (format should be YYYY-MM-DD HH:MM:SS[.ms])"
+#: ../libgda/sqlite/gda-sqlite-recordset.c:556
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:686
+#, fuzzy, c-format
+#| msgid "Invalid timestamp '%s' (format should be YYYY-MM-DD HH:MM:SS[.ms])"
+msgid "Invalid timestamp '%s' (format should be YYYY-MM-DDTHH:MM:SS[.ms])"
msgstr "无效的时间戳 '%s' (格式应该是 YYYY-MM-DD HH:MM:SS[.ms])"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:660
+#: ../libgda/sqlite/gda-sqlite-recordset.c:645
msgid "SQLite provider fatal internal error"
msgstr "SQLite 提供者致命内部错误"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:668
+#: ../libgda/sqlite/gda-sqlite-recordset.c:653
msgid "Truncated data"
msgstr "截断的数据"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:721
+#: ../libgda/sqlite/gda-sqlite-recordset.c:709
#: ../providers/jdbc/gda-jdbc-recordset.c:508
msgid "Requested row could not be found"
msgstr "找不到请求的行"
-#: ../libgda/sqlite/gda-sqlite-recordset.c:752
+#: ../libgda/sqlite/gda-sqlite-recordset.c:741
#: ../providers/jdbc/gda-jdbc-recordset.c:546
msgid "Can't set iterator on requested row"
msgstr "无法在请求的行上设置迭代器"
-#: ../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:204
-msgid "File used to store startup data"
-msgstr "用于存储启动数据的文件"
-
-#: ../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:774
-msgid "Can't remove non LDAP virtual table"
-msgstr "无法移除非 LDAP 的虚拟表"
-
-#: ../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:829
-msgid "Unknown LDAP virtual table"
-msgstr "未知的 LDAP 虚拟表"
-
-#: ../libgda/sqlite/virtual/gda-vconnection-data-model.c:413
+#: ../libgda/sqlite/virtual/gda-vconnection-data-model.c:386
msgid "Table to remove not found"
msgstr "没有找到要删除的表"
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:160
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:128
msgid "Namespace must be specified"
msgstr "命名空间必须指定"
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:212
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:137
+#, c-format
+msgid "There is already a namespace named '%s' in use with another connection"
+msgstr ""
+
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:147
+#, fuzzy, c-format
+#| msgid "Connection string for the internal connection to use"
+msgid "Connection was not added to virtual connection because it is closed"
+msgstr "内部连接用的连接字符串"
+
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:188
msgid "Connection was not represented in hub"
msgstr "总线中没有对连接进行反应"
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:374
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:352
#, c-format
msgid "Unable to get information about table '%s'"
msgstr "无法获得有关表“%s”的信息"
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:600
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:616
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:578
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:594
msgid "Integer value is out of bounds"
msgstr "整数值超出边界"
-#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:656
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:634
msgid "Blob constraints are not handled in virtual table condition"
msgstr "Boolean 约束在虚拟表条件下不能处理"
-#: ../libgda/sqlite/virtual/gda-virtual-connection.c:150
+#: ../libgda/sqlite/virtual/gda-vconnection-hub.c:667
+#: ../providers/postgres/gda-postgres-recordset.c:625
+#, c-format
+msgid "Invalid time '%s' (time format should be HH:MM:SS[.ms])"
+msgstr "无效的时间 '%s' (时间格式必须是 HH:MM:SS[.ms])"
+
+#: ../libgda/sqlite/virtual/gda-virtual-connection.c:85
+#, fuzzy
+#| msgid "Provider does not support asynchronous connection open"
+msgid "Provider did not clean its connection data"
+msgstr "提供者不支持打开异步连接"
+
+#: ../libgda/sqlite/virtual/gda-virtual-connection.c:115
+#, c-format
msgid ""
"Internal error: virtual provider does not implement the create_operation() "
"virtual method"
msgstr "内部错误：虚拟提供者没有实现 create_operation() 虚拟方法"
-#: ../libgda/sqlite/virtual/gda-virtual-connection.c:186
+#: ../libgda/sqlite/virtual/gda-virtual-connection.c:159
msgid "Internal error: invalid provider handle"
msgstr "内部错误：无效的提供者句柄"
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:441
+msgid "Internal Implementation error: No close connection method is defined"
+msgstr ""
+
#. wrong usage!
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:556
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:551
msgid "Wrong usage of Libgda's virtual tables"
msgstr "Libgda 的虚拟表用法错误"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:564
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:559
msgid "Data model must have at least one column"
msgstr "数据模型必须至少有一列"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:581
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:576
msgid "Could not compute virtual table's columns"
msgstr "无法计算虚拟表列"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:604
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:599
#, c-format
msgid "Can't get data model description for column %d"
msgstr "无法为列 %d 获取数据模型描述"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:656
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:651
#, c-format
msgid "Can't get data model's column type for column %d"
msgstr "无法获取列 %d 的数据模型的列类型"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:717
-#, c-format
-msgid "Can't declare virtual table (%s)"
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:713
+#, fuzzy, c-format
+#| msgid "Can't declare virtual table (%s)"
+msgid "Can't declare virtual table (\"%s\"): %s"
msgstr "无法声明虚拟表 (%s)"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:854
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:856
msgid "Internal SQLite error: no data to iterate on"
msgstr "内部 SQLite 错误：无可迭代的数据"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:961
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:962
#, 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:983
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:986
msgid "Column not found"
msgstr "列未找到"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1456
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1471
msgid "No statement specified to modify the data"
msgstr "没有指定修改数据的语句"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1463
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1478
msgid "Invalid statement specified to modify the data"
msgstr "指定的用于修改数据的语句无效"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1483
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1520
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1528
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1498
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1535
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1543
msgid "Invalid parameter in statement to modify the data"
msgstr "提供的用于修改数据的语句中的参数无效"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1560
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1575
#, c-format
msgid "Failed to modify data: %s"
msgstr "修改数据失败：%s"
-#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1642
+#: ../libgda/sqlite/virtual/gda-vprovider-data-model.c:1658
msgid "Data model representing the table is read only"
msgstr "代表表的数据模型为只读"
-#: ../libgda/sql-parser/gda-sql-parser.c:646
-#: ../libgda/sql-parser/gda-sql-parser.c:737
+#: ../libgda/sql-parser/gda-sql-parser.c:617
+#: ../libgda/sql-parser/gda-sql-parser.c:708
msgid "SQL code does not contain any statement"
msgstr "SQL 代码不含有任何语句"
-#: ../libgda/sql-parser/gda-sql-parser.c:820
+#: ../libgda/sql-parser/gda-sql-parser.c:792
#, c-format
msgid "Syntax error at line %d, column %d"
msgstr "%d 行，%d 列中语法错误"
-#: ../libgda/sql-parser/gda-sql-parser.c:833
+#: ../libgda/sql-parser/gda-sql-parser.c:806
#, c-format
msgid "Overflow error at line %d, column %d"
msgstr "行 %d 列 %d 处溢出错误"
-#: ../libgda/sql-parser/gda-statement-struct.c:580
+#: ../libgda/sql-parser/gda-statement-struct.c:590
msgid "GdaSqlField is not part of an INSERT or UPDATE statement"
msgstr "GdaSqlField 不是 INSERT 或 UPDATE 语句的一部分"
-#: ../libgda/sql-parser/gda-statement-struct.c:593
+#: ../libgda/sql-parser/gda-statement-struct.c:603
msgid "Missing table in statement"
msgstr "语句中缺少表"
-#: ../libgda/sql-parser/gda-statement-struct.c:613
-#: ../libgda/sql-parser/gda-statement-struct.c:841
+#: ../libgda/sql-parser/gda-statement-struct.c:623
+#: ../libgda/sql-parser/gda-statement-struct.c:851
#, c-format
msgid "Column '%s' not found"
msgstr "没有找到列 '%s'"
-#: ../libgda/sql-parser/gda-statement-struct.c:659
-#: ../libgda/sql-parser/gda-statement-struct.c:774
+#: ../libgda/sql-parser/gda-statement-struct.c:669
+#: ../libgda/sql-parser/gda-statement-struct.c:784
msgid "GdaSqlSelectField is not part of a SELECT statement"
msgstr "GdaSqlSelectField 不是 SELECT 语句的一部分"
-#: ../libgda/sql-parser/gda-statement-struct.c:722
+#: ../libgda/sql-parser/gda-statement-struct.c:732
msgid "Missing table name in statement"
msgstr "语句中丢失表名"
-#: ../libgda/sql-parser/gda-statement-struct.c:730
-#: ../libgda/sql-parser/gda-statement-struct.c:823
-#: ../libgda/sql-parser/gda-statement-struct.c:868
+#: ../libgda/sql-parser/gda-statement-struct.c:740
+#: ../libgda/sql-parser/gda-statement-struct.c:833
+#: ../libgda/sql-parser/gda-statement-struct.c:878
#, c-format
msgid "Table '%s' not found"
msgstr "没有找到表 '%s'"
-#: ../libgda/sql-parser/gda-statement-struct.c:796
-#: ../libgda/sql-parser/gda-statement-struct.c:811
-#: ../tools/browser/browser-connection.c:1326
-#: ../tools/browser/browser-connection.c:1380
+#: ../libgda/sql-parser/gda-statement-struct.c:806
+#: ../libgda/sql-parser/gda-statement-struct.c:821
+#: ../tools/common/t-connection.c:1887 ../tools/common/t-connection.c:1941
#, c-format
msgid "Could not identify table for field '%s'"
msgstr "无法为字段 '%s' 确定表"
-#: ../libgda/sql-parser/gda-statement-struct.c:998
+#: ../libgda/sql-parser/gda-statement-struct.c:1008
msgid "Expression can't have both a type cast and a parameter specification"
msgstr "表达式不能同时进行类型转换和参数指定"
-#: ../libgda/sql-parser/gda-statement-struct.c:1008
-#: ../libgda/sql-parser/gda-statement-struct.c:1021
-#: ../libgda/sql-parser/gda-statement-struct.c:1034
+#: ../libgda/sql-parser/gda-statement-struct.c:1018
+#: ../libgda/sql-parser/gda-statement-struct.c:1031
+#: ../libgda/sql-parser/gda-statement-struct.c:1044
#, c-format
msgid "'%s' is not a valid identifier"
msgstr "'%s' 不是有效的标识符"
-#: ../libgda/sql-parser/gda-statement-struct.c:1011
-#: ../libgda/sql-parser/gda-statement-struct.c:1024
-#: ../libgda/sql-parser/gda-statement-struct.c:1037
+#: ../libgda/sql-parser/gda-statement-struct.c:1021
+#: ../libgda/sql-parser/gda-statement-struct.c:1034
+#: ../libgda/sql-parser/gda-statement-struct.c:1047
msgid "Empty identifier"
msgstr "空标识符"
-#: ../libgda/sql-parser/gda-statement-struct.c:1046
+#: ../libgda/sql-parser/gda-statement-struct.c:1056
msgid "Operation has no operand"
msgstr "操作没有操作数"
-#: ../libgda/sql-parser/gda-statement-struct.c:1072
-#: ../libgda/sql-parser/gda-statement-struct.c:1079
+#: ../libgda/sql-parser/gda-statement-struct.c:1082
#: ../libgda/sql-parser/gda-statement-struct.c:1089
-#: ../libgda/sql-parser/gda-statement-struct.c:1101
-#: ../libgda/sql-parser/gda-statement-struct.c:1109
+#: ../libgda/sql-parser/gda-statement-struct.c:1099
+#: ../libgda/sql-parser/gda-statement-struct.c:1111
+#: ../libgda/sql-parser/gda-statement-struct.c:1119
msgid "Wrong number of operands"
msgstr "操作数的数目错误"
-#: ../libgda/sql-parser/gda-statement-struct.c:1115
+#: ../libgda/sql-parser/gda-statement-struct.c:1125
#, c-format
msgid "Unknown operator %d"
msgstr "未知的操作符 %d"
-#: ../libgda/sql-parser/gda-statement-struct.c:1138
+#: ../libgda/sql-parser/gda-statement-struct.c:1148
msgid "Missing expression in select field"
msgstr "在选择字段丢失表达式"
-#: ../libgda/sql-parser/gda-statement-struct.c:1147
+#: ../libgda/sql-parser/gda-statement-struct.c:1157
msgid "Missing expression in select target"
msgstr "选择的对象缺少表达式"
-#: ../libgda/sql-parser/gda-statement-struct.c:1156
+#: ../libgda/sql-parser/gda-statement-struct.c:1166
msgid ""
"Join can't at the same time specify a join condition and a list of fields to "
"join on"
-msgstr "联合(join)不能同时指定联合的条件和要联合的字段列表。"
+msgstr "联合(join)不能同时指定联合的条件和要联合的字段列表"
-#: ../libgda/sql-parser/gda-statement-struct.c:1161
+#: ../libgda/sql-parser/gda-statement-struct.c:1171
msgid "Cross join can't have a join condition or a list of fields to join on"
msgstr "交叉联合(cross join)不能具有联合条件或要联合的字段列表"
-#: ../libgda/sql-parser/gda-statement-struct.c:1170
+#: ../libgda/sql-parser/gda-statement-struct.c:1180
msgid "Empty FROM clause"
msgstr "空 FROM 条文"
-#: ../libgda/sql-parser/gda-statement-struct.c:1445
+#: ../libgda/sql-parser/gda-statement-struct.c:1455
msgid "Select field is not in a SELECT statement"
msgstr "SELECT 语句中没有选择字段"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:234
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:233
msgid "COMPOUND statement contains an undefined COMPOUND statement"
msgstr "COMPOUND 语句包含一个未定义的 COMPOUND 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:243
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:282
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:242
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:281
msgid "COMPOUND statement contains an undefined SELECT statement"
msgstr "COMPOUND 语句包含一个未定义的 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:252
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:294
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:251
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:293
msgid "COMPOUND statement contains a non SELECT statement"
msgstr "COMPOUND 语句包含一个非 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:266
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:265
msgid "COMPOUND statement does not contain any SELECT statement"
msgstr "COMPOUND 语句不包含任何 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:272
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:271
msgid "COMPOUND statement only contains one SELECT statement"
msgstr "COMPOUND 语句只包含一个 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:302
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:301
msgid "COMPOUND statement contains an empty SELECT statement"
msgstr "COMPOUND 语句包含一个空 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-compound.c:308
+#: ../libgda/sql-parser/gda-statement-struct-compound.c:307
msgid "All statements in a COMPOUND must have the same number of columns"
msgstr "COMPOUND 语句中的所有语句必须汉语一定数量的列"
@@ -3104,43 +3618,43 @@ msgstr "COMPOUND 语句中的所有语句必须汉语一定数量的列"
msgid "DELETE statement needs a table to delete from"
msgstr "DELETE 语句需要一个要从中删除的表"
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:358
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:356
msgid "INSERT statement needs a table to insert into"
msgstr "INSERT 语句需要一个要插入到的表"
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:364
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:362
msgid "Can't specify values to insert and SELECT statement in INSERT statement"
msgstr "在 INSERT 语句中无法指定要插入的值及 SELECT 语句"
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:385
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:411
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:383
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:409
msgid ""
"INSERT statement does not have the same number of target columns and "
"expressions"
msgstr "INSERT 语句的目标列数目和表达式数目不一致"
-#: ../libgda/sql-parser/gda-statement-struct-insert.c:414
+#: ../libgda/sql-parser/gda-statement-struct-insert.c:412
msgid "VALUES lists must all be the same length in INSERT statement"
msgstr "INSERT 语句中的 VALUES 列表长度必须全部相等"
-#: ../libgda/sql-parser/gda-statement-struct-select.c:407
+#: ../libgda/sql-parser/gda-statement-struct-select.c:404
msgid "SELECT does not contain any expression"
msgstr "SELECT 语句不包含任何语句"
-#: ../libgda/sql-parser/gda-statement-struct-select.c:413
+#: ../libgda/sql-parser/gda-statement-struct-select.c:410
msgid "SELECT can't have a DISTINCT expression if DISTINCT is not set"
msgstr "如果 DISTINCT 未设置，SELECT 不能含有 DISTINCT 表达式"
-#: ../libgda/sql-parser/gda-statement-struct-select.c:419
+#: ../libgda/sql-parser/gda-statement-struct-select.c:416
msgid "SELECT can't have a HAVING without GROUP BY"
msgstr "SELECT 不能含有不带 GROUP BY 的 HAVING"
-#: ../libgda/sql-parser/gda-statement-struct-select.c:425
+#: ../libgda/sql-parser/gda-statement-struct-select.c:422
msgid "SELECT can't have a limit offset without a limit"
msgstr "SELECT 不能含有不带限制的限制偏移"
-#: ../libgda/sql-parser/gda-statement-struct-select.c:450
-#: ../libgda/sql-parser/gda-statement-struct-select.c:459
+#: ../libgda/sql-parser/gda-statement-struct-select.c:447
+#: ../libgda/sql-parser/gda-statement-struct-select.c:456
#, c-format
msgid "Multiple targets named or aliased '%s'"
msgstr "有多个名字或别名为 '%s' 的目标"
@@ -3159,203 +3673,230 @@ msgstr "UPDATE 语句的目标列数目和表达式数目不一致"
msgid "UPDATE statement does not have any target columns to update"
msgstr "UPDATE 语句没有任何目标列可更新"
-#: ../libgda/thread-wrapper/gda-connect.c:276
+#: ../libgda/thread-wrapper/gda-connect.c:150
+msgid ""
+"The GMainContext passed when gda_signal_connect() was called is not owned by "
+"any thread, you may expect some undesired behaviours, use "
+"g_main_context_acquire()"
+msgstr ""
+
+#: ../libgda/thread-wrapper/gda-connect.c:280
#, c-format
-#| msgid "Could not find dataset named '%s'"
msgid "Could not find signal named \"%s\""
msgstr "无法找到名为“%s” 的信号"
-#: ../libgda/thread-wrapper/gda-connect.c:326
-#, c-format
-#| msgid "Could not find table '%s.%s'"
-msgid "Could not find handler %lu"
-msgstr "找不到处理程序“%lu”"
-
-#: ../libgda/thread-wrapper/gda-worker.c:170
+#: ../libgda/thread-wrapper/gda-worker.c:183
msgid ""
"Possible memory leak as no destroy function provided to free value returned "
"by the worker thread"
msgstr "未提供释放工作线程返回值的销毁函数，可能导致内存泄露"
-#: ../libgda/thread-wrapper/gda-worker.c:508
-#: ../libgda/thread-wrapper/gda-worker.c:573
+#: ../libgda/thread-wrapper/gda-worker.c:594
+#: ../libgda/thread-wrapper/gda-worker.c:660
#, c-format
-#| msgid "Unknown part ID %u"
msgid "Unknown requested job %u"
msgstr "未知请求任务 %u"
-#: ../libgda/thread-wrapper/gda-worker.c:516
+#: ../libgda/thread-wrapper/gda-worker.c:602
#, c-format
msgid "Job %u has been cancelled"
msgstr "任务 %u 被取消"
-#: ../libgda/thread-wrapper/gda-worker.c:531
-#: ../libgda/thread-wrapper/gda-worker.c:580
+#: ../libgda/thread-wrapper/gda-worker.c:617
+#: ../libgda/thread-wrapper/gda-worker.c:667
#, c-format
msgid "Job %u is being processed"
msgstr "任务 %u 正在处理"
-#: ../libgda/thread-wrapper/gda-worker.c:534
+#: ../libgda/thread-wrapper/gda-worker.c:620
#, c-format
msgid "Job %u has not yet been processed"
msgstr "任务 %u 尚未处理"
-#: ../libgda/thread-wrapper/gda-worker.c:583
+#: ../libgda/thread-wrapper/gda-worker.c:670
#, c-format
-#| msgid "A transaction has already been started"
msgid "Job %u has already been processed"
msgstr "任务 %u 已经在处理了"
-#: ../libgda/thread-wrapper/gda-worker.c:723
+#: ../libgda/thread-wrapper/gda-worker.c:809
#, c-format
msgid "Cannot build inter thread communication device"
msgstr "无法构建内部线程(inter thread)通讯设备"
-#: ../libgda/thread-wrapper/gda-worker.c:732
+#: ../libgda/thread-wrapper/gda-worker.c:818
#, c-format
-#| msgid "Internal error"
msgid "GdaWorker internal error"
msgstr "GdaWorker 内部错误"
-#: ../libgda-ui/data-entries/common-bin.c:40
+#: ../libgda-ui/data-entries/common-bin.c:46
+#: ../libgda-ui/data-entries/common-bin.c:182
+#: ../libgda-ui/data-entries/plugins/common-pict.c:365
+#: ../libgda-ui/data-entries/plugins/common-pict.c:483
+#: ../libgda-ui/gdaui-rt-editor.c:726 ../libgda-ui/internal/utility.c:497
+#, fuzzy
+#| msgid "Error:"
+msgid "Error"
+msgstr "错误："
+
+#: ../libgda-ui/data-entries/common-bin.c:59
msgid "Select file to load"
msgstr "选择要加载的文件"
-#: ../libgda-ui/data-entries/common-bin.c:79
-#: ../libgda-ui/data-entries/plugins/common-pict.c:422
-#: ../libgda-ui/gdaui-rt-editor.c:730
-#, c-format
-msgid ""
-"Could not load the contents of '%s':\n"
-" %s"
+#: ../libgda-ui/data-entries/common-bin.c:63
+#: ../libgda-ui/data-entries/common-bin.c:163
+#: ../libgda-ui/data-entries/plugins/common-pict.c:329
+#: ../libgda-ui/gdaui-rt-editor.c:686
+msgid "_Open"
+msgstr ""
+
+#: ../libgda-ui/data-entries/common-bin.c:96
+#: ../libgda-ui/data-entries/plugins/common-pict.c:360
+#: ../libgda-ui/gdaui-rt-editor.c:721
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not load the contents of '%s':\n"
+#| " %s"
+msgid "Could not load the contents of '%s'"
msgstr ""
"无法加载 '%s' 的内容：\n"
" %s"
-#: ../libgda-ui/data-entries/common-bin.c:110
+#: ../libgda-ui/data-entries/common-bin.c:159
msgid "Select a file to save data to"
msgstr "选择一个保存数据到的文件"
-#: ../libgda-ui/data-entries/common-bin.c:156
-#, c-format
-msgid ""
-"Could not save data to '%s':\n"
-" %s"
+#: ../libgda-ui/data-entries/common-bin.c:177
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not save data to '%s':\n"
+#| " %s"
+msgid "Could not save data to '%s'"
msgstr ""
"无法保存文件到 '%s'：\n"
" %s"
-#: ../libgda-ui/data-entries/common-bin.c:196
-msgid "Properties"
-msgstr "属性"
+#: ../libgda-ui/data-entries/common-bin.c:234
+#, fuzzy
+#| msgid "_Load image from file"
+msgid "Load data from file"
+msgstr "从文件加载图像(_L)"
-#: ../libgda-ui/data-entries/common-bin.c:236
-#, c-format
-msgid "%lu Byte"
-msgid_plural "%lu Bytes"
-msgstr[0] "%lu 字节"
+#: ../libgda-ui/data-entries/common-bin.c:241
+#, fuzzy
+#| msgid "Saving data to a file"
+msgid "Save data to file"
+msgstr "保存数据到文件"
-#: ../libgda-ui/data-entries/common-bin.c:268
-#: ../libgda-ui/data-entries/common-bin.c:317
-#: ../libgda-ui/data-entries/plugins/common-pict.c:43
-#: ../libgda-ui/data-entries/plugins/common-pict.c:75
-msgid "No data"
-msgstr "无数据"
+#: ../libgda-ui/data-entries/common-bin.c:248
+#, fuzzy
+#| msgid "Binary data"
+msgid "Clear data"
+msgstr "二进制数据"
-#: ../libgda-ui/data-entries/common-bin.c:273
-#: ../libgda-ui/data-entries/common-bin.c:289
-#: ../libgda-ui/data-entries/common-bin.c:302
-#: ../libgda-ui/data-entries/common-bin.c:306
-msgid "Data size"
-msgstr "数据大小"
-
-#: ../libgda-ui/data-entries/common-bin.c:302
-#: ../providers/ldap/gda-ldap-provider.c:1017
-#: ../providers/mysql/gda-mysql-provider.c:643
-#: ../providers/mysql/gda-mysql-provider.c:697
-#: ../providers/mysql/gda-mysql-util.c:63
-#: ../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"
+#: ../libgda-ui/data-entries/common-bin.c:256
+msgid "Open with..."
+msgstr ""
+
+#: ../libgda-ui/data-entries/common-bin.c:270
+#, c-format
+msgid "%lu Byte"
+msgid_plural "%lu Bytes"
+msgstr[0] "%lu 字节"
+
+#: ../libgda-ui/data-entries/common-bin.c:315
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown size"
msgstr "未知"
-#. list of fields
-#: ../libgda-ui/data-entries/common-bin.c:326
-#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:5
-#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:12
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:9
-#: ../providers/mysql/mysql_specs_add_column.xml.in.h:9
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:15
-#: ../providers/oracle/oracle_specs_create_table.xml.in.h:9
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:7
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:19
-#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:5
-#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:12
-#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:5
-#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:12
-msgid "Data type"
-msgstr "数据类型"
+#: ../libgda-ui/data-entries/common-bin.c:420
+#, fuzzy
+#| msgid "Could not create directory '%s'"
+msgid "Could not create temporary directory"
+msgstr "无法创建目录 '%s'"
+
+#: ../libgda-ui/data-entries/common-bin.c:457
+#, fuzzy
+#| msgid "Could not open connection"
+msgid "Could not run selected application"
+msgstr "无法打开连接"
+
+#: ../libgda-ui/data-entries/common-bin.c:464
+#, fuzzy
+#| msgid "Could not save data: %s"
+msgid "Could not export data"
+msgstr "无法保存数据：%s"
+
+#: ../libgda-ui/data-entries/common-bin.c:522
+msgid "Open with"
+msgstr ""
#. FIXME: find a better label
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:159
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:155
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:187
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:128
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:125
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:156
#: ../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:834 ../libgda-ui/gdaui-basic-form.c:870
-#: ../libgda-ui/gdaui-raw-grid.c:785
-#: ../providers/ldap/gda-ldap-provider.c:1031 ../tools/config-info.c:122
-#: ../tools/config-info.c:291 ../tools/gda-sql.c:3275 ../tools/gda-sql.c:3992
-#: ../tools/gda-sql.c:5372
+#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:182
+#: ../libgda-ui/gdaui-basic-form.c:782 ../libgda-ui/gdaui-basic-form.c:818
+#: ../libgda-ui/gdaui-raw-grid.c:674 ../providers/ldap/gda-ldap-provider.c:1087
+#: ../tools/common/t-app.c:2256 ../tools/common/t-app.c:2327
+#: ../tools/common/t-app.c:3734 ../tools/common/t-app.c:5536
+#: ../tools/common/t-config-info.c:124 ../tools/common/t-config-info.c:293
msgid "Value"
msgstr "值"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:160
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:156
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:188
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:129
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:126
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:157
#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c:169
-#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:184
+#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:183
msgid "GValue to render"
msgstr "要渲染的 GValue"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:172
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:168
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-info.c:159
-#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:196
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:141
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:138
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-info.c:126
+#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:195
msgid "Editable"
msgstr "可编辑"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:169
-#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:197
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-bin.c:246
+#, c-format
+msgid ""
+"Could not find icon file bin-attachment.png in resources please report error "
+"to https://gitlab.gnome.org/GNOME/libgda/issues. Error message: %s"
+msgstr ""
+
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-boolean.c:139
+#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-pict.c:196
msgid "The toggle button can be activated"
msgstr "切换按钮可以激活"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:161
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:130
msgid "Values limited to PK fields"
msgstr "限于 PK 字段的值"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:162
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:131
msgid "GList of GValue to render, limited to PK fields"
msgstr "要渲染的 GValue 的 GList，限于 PK 字段"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:168
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:137
msgid "Values"
msgstr "值"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:169
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-combo.c:138
msgid "GList of GValue to render, not limited to PK fields "
msgstr "要渲染的 GValue 的 GList，不限于 PK 字段 "
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-info.c:160
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-info.c:127
msgid "The information and status changer can be activated"
msgstr "信息和状态更改器可被激活"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:408
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:376
msgid "string truncated because too long"
msgstr "字符串过长而被截断"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:434
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:402
#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c:274
#, c-format
msgid ""
@@ -3363,7 +3904,7 @@ msgid ""
"display type (%s)"
msgstr "数据单元格渲染器的指定类型(%s)与要显示类型(%s)的实际值不同"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:441
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:409
#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c:280
#, c-format
msgid ""
@@ -3373,30 +3914,58 @@ msgstr ""
"数据单元格需要显示不同数据类型的值，至少 %s 和 %s，这表示数据模型有某些不一致"
"的地方"
-#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:507
+#: ../libgda-ui/data-entries/gdaui-data-cell-renderer-textual.c:475
#: ../libgda-ui/data-entries/plugins/gdaui-data-cell-renderer-password.c:299
msgid "<non-printable>"
msgstr "<不可打印>"
-#: ../libgda-ui/data-entries/gdaui-entry.c:202
-#: ../libgda-ui/data-entries/gdaui-entry.c:221
-#: ../libgda-ui/data-entries/gdaui-formatted-entry.c:165
+#: ../libgda-ui/data-entries/gdaui-entry-bin.c:138
+#: ../libgda-ui/data-entries/plugins/common-pict.c:46
+#: ../libgda-ui/data-entries/plugins/common-pict.c:78
+msgid "No data"
+msgstr "无数据"
+
+#: ../libgda-ui/data-entries/gdaui-entry.c:173
+#: ../libgda-ui/data-entries/gdaui-entry.c:193
+#: ../libgda-ui/data-entries/gdaui-formatted-entry.c:142
msgid "Invalid UTF-8 format!"
msgstr "无效的 UTF-8 格式！"
-#. format tooltip
-#: ../libgda-ui/data-entries/gdaui-entry-common-time.c:1007
-msgid "Format is hh:mm:ss"
-msgstr "格式为 hh:mm:ss"
+#: ../libgda-ui/data-entries/gdaui-entry-common-time.c:439
+#, c-format
+msgid ""
+"Expected format is %s\n"
+"Time is relative to local time (%s)"
+msgstr ""
+
+#: ../libgda-ui/data-entries/gdaui-entry-common-time.c:574
+msgid "Can't set value to entry: Invalid Data Type for Entry Wrapper Time"
+msgstr ""
+
+#: ../libgda-ui/data-entries/gdaui-entry-common-time.c:670
+msgid "Can't get value from entry: Invalid Data Type for Entry Wrapper Time"
+msgstr ""
+#: ../libgda-ui/data-entries/gdaui-entry-integer.xml.in.h:1
#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:1
msgid "Use 1000s separators"
msgstr "使用千位分隔符"
+#: ../libgda-ui/data-entries/gdaui-entry-integer.xml.in.h:2
#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:2
msgid "Use thousands separator as specified by current locale"
msgstr "使用当前区域指定的千位分隔符"
+#: ../libgda-ui/data-entries/gdaui-entry-integer.xml.in.h:3
+#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:5
+msgid "Currency symbol"
+msgstr "货币符号"
+
+#: ../libgda-ui/data-entries/gdaui-entry-integer.xml.in.h:4
+#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:6
+msgid "A currency symbol"
+msgstr "货币符号"
+
#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:3
msgid "Decimals"
msgstr "小数"
@@ -3405,15 +3974,64 @@ msgstr "小数"
msgid "Number of decimals"
msgstr "小数位数"
-#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:5
-msgid "Currency symbol"
-msgstr "货币符号"
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:76
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:409
+#, fuzzy
+#| msgid "Unspecified table name"
+msgid "Unspecified"
+msgstr "未指定的表名"
-#: ../libgda-ui/data-entries/gdaui-entry-number.xml.in.h:6
-msgid "A currency symbol"
-msgstr "货币符号"
+#. list of fields
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:77
+#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:9
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:26
+#: ../providers/mysql/mysql_specs_add_column.xml.in.h:16
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:29
+#: ../providers/oracle/oracle_specs_create_table.xml.in.h:17
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:17
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:34
+#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:9
+#: ../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/common/t-app.c:1839 ../tools/common/web-server.c:852
+msgid "Default"
+msgstr "默认"
+
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:78
+#, fuzzy
+#| msgid "Document not specified"
+msgid "Default (unspecified)"
+msgstr "文档未指定"
+
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:79
+#, fuzzy
+#| msgid "Invalid type"
+msgid "Invalid"
+msgstr "无效类型"
+
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:256
+msgid "Edit"
+msgstr "编辑"
+
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:263
+#, fuzzy
+#| msgid "Document not specified"
+msgid "Define as unspecified"
+msgstr "文档未指定"
+
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:270
+#, fuzzy
+#| msgid "Set as default"
+msgid "Define as default"
+msgstr "设为默认"
+
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:277
+#: ../tools/browser/data-manager/data-console.c:384
+msgid "Reset"
+msgstr "重设"
-#: ../libgda-ui/data-entries/gdaui-entry-shell.c:238
+#: ../libgda-ui/data-entries/gdaui-entry-shell.c:410
#, c-format
msgid ""
"Widget of class '%s' does not have any associated GdaDataHandler, (to be set "
@@ -3422,18 +4040,6 @@ msgstr ""
"类“%s”的部件(widget)没有任何关联的 GdaDataHandler，(而使用“handler”属性设置)"
"可能会有一些异常行为"
-#: ../libgda-ui/data-entries/gdaui-entry-shell.c:394
-msgid "Value is NULL"
-msgstr "值为 NULL"
-
-#: ../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:406
-msgid "Value is invalid"
-msgstr "值无效"
-
#: ../libgda-ui/data-entries/gdaui-entry-string.xml.in.h:1
msgid "Maximum length"
msgstr "最大长度"
@@ -3460,47 +4066,36 @@ msgid ""
"character, suitable to enter passwords"
msgstr "若设为 TRUE，所有字符均将显示为一个“不可见”的字符，适用于输入密码"
-#: ../libgda-ui/data-entries/gdaui-formatted-entry.c:278
+#: ../libgda-ui/data-entries/gdaui-formatted-entry.c:254
#, c-format
msgid "Unknown format character starting at %s"
msgstr "%s 以未知格式的字符串开头"
-#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:268
+#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:237
#, c-format
msgid "Type %s is not numerical"
msgstr "类型 %s 不是数值型"
-#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:282
+#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:251
#, c-format
msgid "Decimal separator cannot be the '%c' character"
msgstr "小数分隔符不能是 '%c' 字符"
-#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:292
+#: ../libgda-ui/data-entries/gdaui-numeric-entry.c:261
#, 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:416
+#: ../libgda-ui/data-entries/plugins/common-pict.c:109
+#: ../libgda-ui/data-entries/plugins/common-pict.c:124
msgid "Empty data"
msgstr "空数据"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:113
+#: ../libgda-ui/data-entries/plugins/common-pict.c:116
msgid "Unhandled type of data"
msgstr "未处理的数据类型"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:211
-#, c-format
-msgid ""
-"Error while deserializing data:\n"
-"%s"
-msgstr ""
-"在反序列化数据时出错：\n"
-"%s"
-
-#: ../libgda-ui/data-entries/plugins/common-pict.c:221
-#: ../libgda-ui/data-entries/plugins/common-pict.c:264
+#: ../libgda-ui/data-entries/plugins/common-pict.c:224
#, c-format
msgid ""
"Error while interpreting data as an image:\n"
@@ -3509,45 +4104,55 @@ msgstr ""
"作为图像解释数据时出错：\n"
"%s"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:328
+#: ../libgda-ui/data-entries/plugins/common-pict.c:285
msgid "_Copy image"
msgstr "复制图像(_C)"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:336
+#: ../libgda-ui/data-entries/plugins/common-pict.c:293
msgid "_Load image from file"
msgstr "从文件加载图像(_L)"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:343
+#: ../libgda-ui/data-entries/plugins/common-pict.c:302
msgid "_Save image"
msgstr "保存图像(_S)"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:360
-#: ../libgda-ui/gdaui-rt-editor.c:689
+#: ../libgda-ui/data-entries/plugins/common-pict.c:325
+#: ../libgda-ui/gdaui-rt-editor.c:682
msgid "Select image to load"
msgstr "选择要加载的图像"
#. determine writable formats
-#: ../libgda-ui/data-entries/plugins/common-pict.c:468
+#: ../libgda-ui/data-entries/plugins/common-pict.c:415
msgid "Image format"
msgstr "图像格式"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:472
+#: ../libgda-ui/data-entries/plugins/common-pict.c:419
msgid "Format image as:"
msgstr "格式化图像为："
-#: ../libgda-ui/data-entries/plugins/common-pict.c:484
+#: ../libgda-ui/data-entries/plugins/common-pict.c:431
msgid "Current format"
msgstr "当前格式"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:487
+#: ../libgda-ui/data-entries/plugins/common-pict.c:434
msgid "Select a file to save the image to"
msgstr "选择一个保存图像到的文件"
-#: ../libgda-ui/data-entries/plugins/common-pict.c:534
-#, c-format
-msgid ""
-"Could not save the image to '%s':\n"
-" %s"
+#: ../libgda-ui/data-entries/plugins/common-pict.c:438
+#: ../libgda-ui/gdaui-raw-grid.c:1734
+#: ../tools/browser/canvas/browser-canvas.c:470
+#: ../tools/browser/ldap-browser/entry-properties.c:227
+#, fuzzy
+#| msgid "Save"
+msgid "_Save"
+msgstr "保存"
+
+#: ../libgda-ui/data-entries/plugins/common-pict.c:478
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not save the image to '%s':\n"
+#| " %s"
+msgid "Could not save the image to '%s'"
msgstr ""
"无法保存图像到 '%s'：\n"
" %s"
@@ -3616,6 +4221,11 @@ msgstr "选择一个文件"
msgid "Choose a directory"
msgstr "选择目录"
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:201
+#: ../tools/browser/connection-binding-properties.c:206
+msgid "_Apply"
+msgstr ""
+
#: ../libgda-ui/data-entries/plugins/gdaui-entry-filesel.c:235
msgid "Choose"
msgstr "选择"
@@ -3686,7 +4296,7 @@ msgstr "MD5 校验和"
msgid "No encoding"
msgstr "无编码"
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:258
+#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict.c:262
msgid "No data to display"
msgstr "没有要显示的数据"
@@ -3695,17 +4305,6 @@ msgid "Encoding used to convert binary data to the string"
msgstr "用于转换二进制数据到字符串的编码"
#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in.h:3
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict-spec.xml.in.h:1
-msgid "Serialized picture"
-msgstr "序列化图片"
-
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in.h:4
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict-spec.xml.in.h:2
-msgid ""
-"Set to TRUE if data comes from a serialized GdkPixbuf (F-Spot for example)"
-msgstr "若数据来自一个序列化的 GdkPixbuf (如 F-Spot)，设为 TRUE"
-
-#: ../libgda-ui/data-entries/plugins/gdaui-entry-pict-spec_string.xml.in.h:5
msgid "Base 64"
msgstr "Base 64"
@@ -3741,37 +4340,47 @@ msgstr "在单词之间断行"
msgid "Break lines in between words or graphemes"
msgstr "在单词(words)或字素(graphemes)之间断行"
-#: ../libgda-ui/data/server_operation.glade.h:1 ../tools/gda-sql.c:2005
-#: ../tools/gda-sql.c:2095 ../tools/gda-sql.c:2105 ../tools/gda-sql.c:2114
-#: ../tools/gda-sql.c:2191 ../tools/gda-sql.c:2199 ../tools/gda-sql.c:2207
-#: ../tools/gda-sql.c:2216
+#: ../libgda-ui/data-entries/plugins/libmain.c:81
+#: ../libgda-ui/data-entries/plugins/libmain.c:118
+#: ../libgda-ui/data-entries/plugins/libmain.c:144
+#: ../libgda-ui/data-entries/plugins/libmain.c:173
+#: ../libgda-ui/data-entries/plugins/libmain.c:181
+#: ../libgda-ui/data-entries/plugins/libmain.c:287
+#, c-format
+msgid "Missing spec. file '%s'"
+msgstr "缺少规范文件“%s”"
+
+#: ../libgda-ui/data/server_operation.xml.h:1 ../tools/common/t-app.c:940
+#: ../tools/common/t-app.c:1034 ../tools/common/t-app.c:1046
+#: ../tools/common/t-app.c:1056 ../tools/common/t-app.c:1134
+#: ../tools/common/t-app.c:1141 ../tools/common/t-app.c:1148
+#: ../tools/common/t-app.c:1158 ../tools/common/t-app.c:1168
msgid "General"
msgstr "一般"
-#: ../libgda-ui/data/server_operation.glade.h:2
-msgid "hello"
-msgstr "hello"
-
-#: ../libgda-ui/data/server_operation.glade.h:3
-#: ../tools/browser/common/fk-declare.c:255
-#: ../tools/browser/schema-browser/table-info.c:379
+#: ../libgda-ui/data/server_operation.xml.h:2 ../tools/browser/fk-declare.c:250
+#: ../tools/browser/schema-browser/table-info.c:436
msgid "Columns"
msgstr "列"
-#: ../libgda-ui/data/server_operation.glade.h:4
+#: ../libgda-ui/data/server_operation.xml.h:3
msgid "Foreign keys"
msgstr "外键"
-#: ../libgda-ui/data/server_operation.glade.h:5
+#: ../libgda-ui/data/server_operation.xml.h:4
msgid "Constraints"
msgstr "约束"
-#: ../libgda-ui/demos/main.c:767
+#: ../libgda-ui/data/server_operation.xml.h:6
+msgid "CREATE_TABLE"
+msgstr ""
+
+#: ../libgda-ui/demos/main.c:763
#, c-format
msgid "Can't find demo database file: %s"
msgstr "无法找到演示数据库文件：%s"
-#: ../libgda-ui/demos/main.c:777
+#: ../libgda-ui/demos/main.c:773
#, c-format
msgid ""
"Error opening the connection for file '%s':\n"
@@ -3780,21 +4389,24 @@ msgstr ""
"为文件 '%s' 打开连接时出错：\n"
"%s\n"
-#: ../libgda-ui/demos/main.c:812
+#: ../libgda-ui/demos/main.c:808
msgid "Libgda-ui Code Demos"
msgstr "Libgda-ui 编码演示"
-#: ../libgda-ui/demos/main.c:869
-#, c-format
+#: ../libgda-ui/demos/main.c:865
+#, fuzzy, c-format
#| msgid ""
#| "<b><big>Note:\n"
-#| "</big></b>Many of the demonstrated items use an\n"
-#| "opened connection to the SQLite using the\n"
-#| "'%s' file.\n"
+#| "</big></b>Many of the demonstrated items use an opened connection to the "
+#| "SQLite using the '%s' file.\n"
#| "\n"
-#| "In the source code shown here, the <i>demo_cnc</i> and \n"
-#| "<i>demo_parser</i> objects are created by the framework and\n"
-#| "made available to all the demonstrated items."
+#| "In the source code shown here, the <i>demo_cnc</i> and <i>demo_parser</i> "
+#| "objects are created by the framework and made available to all the "
+#| "demonstrated items.\n"
+#| "\n"
+#| "To illustrate that calls are non blocking, there is a spinner at the top "
+#| "(which must never stop spinning), and a 1 second delay has been added "
+#| "whenever the connection is used."
msgid ""
"<b><big>Note:\n"
"</big></b>Many of the demonstrated items use an opened connection to the "
@@ -3805,8 +4417,8 @@ msgid ""
"demonstrated items.\n"
"\n"
"To illustrate that calls are non blocking, there is a spinner at the top "
-"(which must never stop spinning), and a 1 second delay has been added "
-"whenever the connection is used."
+"(which must never stop spinning), and a 1 second delay is added whenever the "
+"connection is used."
msgstr ""
"<b><big>注：\n"
"</big></b>很多演示条目通过“%s”文件与 SQLite 进行了开放连接。\n"
@@ -3814,97 +4426,93 @@ msgstr ""
"这里显示的源代码中，<i>demo_cnc</i> 和<i>demo_parser</i> 对象由框架创建，并且"
"所有演示条目均可使用。\n"
"\n"
-"为了演示调用是非阻塞的，顶部显示了一个旋转指示器(应该一直在旋转)，一使用连接，就会增加 1 秒钟的延迟。"
+"为了演示调用是非阻塞的，顶部显示了一个旋转指示器(应该一直在旋转)，一使用连"
+"接，就会增加 1 秒钟的延迟。"
-#: ../libgda-ui/gdaui-basic-form.c:291
+#: ../libgda-ui/gdaui-basic-form.c:267
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:295
+#: ../libgda-ui/gdaui-basic-form.c:271
msgid "List of parameters to show in the form"
msgstr "将显示在表单中的参数列表"
-#: ../libgda-ui/gdaui-basic-form.c:309
-msgid "Show Entry actions"
-msgstr "显示记录操作"
-
-#: ../libgda-ui/gdaui-basic-form.c:314
+#: ../libgda-ui/gdaui-basic-form.c:275
msgid "Entries Auto-default"
msgstr "记录自动默认值"
-#: ../libgda-ui/gdaui-basic-form.c:319
+#: ../libgda-ui/gdaui-basic-form.c:280
msgid "TRUE if expanding the form vertically makes sense"
msgstr "若纵向扩展表单有意义则为 TRUE"
-#: ../libgda-ui/gdaui-basic-form.c:343
+#: ../libgda-ui/gdaui-basic-form.c:305
msgid "Shown data entries"
msgstr "已显示的数据集"
-#: ../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
+#. only 1 item in the list
+#: ../libgda-ui/gdaui-basic-form.c:889
#, c-format
-msgid "The '%s' attribute should be a G_TYPE_STRING value"
-msgstr "“%s”属性应为 G_TYPE_STRING 值"
+msgid "There are more entries than expected in group. Found %d"
+msgid_plural "There are more entries than expected in group. Found %d"
+msgstr[0] ""
-#: ../libgda-ui/gdaui-basic-form.c:1894
+#: ../libgda-ui/gdaui-basic-form.c:1843
msgid "Can't find data entry for GdaHolder"
msgstr "无法为 GdaHolder 找到数据记录"
-#: ../libgda-ui/gdaui-basic-form.c:2155
+#: ../libgda-ui/gdaui-basic-form.c:2112
msgid "Values to be defined"
msgstr "要定义的值"
-#: ../libgda-ui/gdaui-basic-form.c:2227 ../libgda-ui/gdaui-raw-grid.c:2729
+#: ../libgda-ui/gdaui-basic-form.c:2117
+#: ../libgda-ui/gdaui-server-operation.c:1074
+#: ../tools/browser/ldap-browser/vtable-dialog.c:157
+msgid "_Ok"
+msgstr "确定(_O)"
+
+#: ../libgda-ui/gdaui-basic-form.c:2184 ../libgda-ui/gdaui-raw-grid.c:2300
#, c-format
msgid "'%s' document not parsed successfully"
msgstr "“%s”文档解析未成功"
-#: ../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 数据布局有效性检查(可能出现某些错误)"
-
-#: ../libgda-ui/gdaui-basic-form.c:2369
+#: ../libgda-ui/gdaui-basic-form.c:2337
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:247 ../libgda-ui/gdaui-cloud.c:981
+#: ../libgda-ui/gdaui-cloud.c:209 ../libgda-ui/gdaui-cloud.c:956
#, c-format
msgid "Wrong column type for label: expecting a string and got a %s"
msgstr "标签的列类型错误：应为字符串，但得到了 %s"
-#: ../libgda-ui/gdaui-cloud.c:1074 ../tools/browser/common/objects-cloud.c:459
+#: ../libgda-ui/gdaui-cloud.c:1050 ../tools/browser/objects-cloud.c:459
msgid "Find:"
msgstr "查找："
-#: ../libgda-ui/gdaui-combo.c:131
+#: ../libgda-ui/gdaui-combo.c:94
msgid "The data model to display"
msgstr "要显示的数据模型"
-#: ../libgda-ui/gdaui-combo.c:135
+#: ../libgda-ui/gdaui-combo.c:98
msgid "Display popup as list"
msgstr "以列表显示弹出项目"
-#: ../libgda-ui/gdaui-data-filter.c:176
+#: ../libgda-ui/gdaui-data-filter.c:146
msgid "Filter failed:"
msgstr "过滤器失败："
-#: ../libgda-ui/gdaui-data-filter.c:210
+#: ../libgda-ui/gdaui-data-filter.c:182
msgid "Filter"
msgstr "过滤器"
-#: ../libgda-ui/gdaui-data-filter.c:210
+#: ../libgda-ui/gdaui-data-filter.c:182
msgid "any valid SQL expression"
msgstr "任何有效的 SQL 表达式"
-#: ../libgda-ui/gdaui-data-filter.c:214
+#: ../libgda-ui/gdaui-data-filter.c:186
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 "
@@ -3915,276 +4523,302 @@ msgstr ""
"效的表达式：<b><tt>_2 like 'doe%'</tt></b> 用来过滤第 2 列以 <tt>doe</tt> 开"
"头的行。"
-#: ../libgda-ui/gdaui-data-filter.c:231
+#: ../libgda-ui/gdaui-data-filter.c:203
msgid "Set filter"
msgstr "设置过滤器"
-#: ../libgda-ui/gdaui-data-filter.c:236
+#: ../libgda-ui/gdaui-data-filter.c:208
msgid "Clear filter"
msgstr "清理过滤器"
-#: ../libgda-ui/gdaui-data-proxy-info.c:821
-msgid "Undelete the selected entry"
-msgstr "取消删除选中的记录"
+#: ../libgda-ui/gdaui-data-proxy.c:155
+#, fuzzy
+#| msgid "CREATE TABLE operation is not supported by the database server"
+msgid "GdauiAction is not supported by this GdauiDataProxy interface"
+msgstr "数据库服务器不支持 CREATE TABLE 操作"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:89
+msgid "Insert new data"
+msgstr "插入新数据"
-#: ../libgda-ui/gdaui-data-proxy-info.c:828
+#: ../libgda-ui/gdaui-data-proxy-info.c:90
+msgid "Commit the changes"
+msgstr "提交更改"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:91
+#: ../libgda-ui/gdaui-data-proxy-info.c:883
msgid "Delete the selected entry"
msgstr "删除选中的记录"
-#: ../libgda-ui/gdaui-data-selector.c:230
+#. undelete: "document-revert"
+#: ../libgda-ui/gdaui-data-proxy-info.c:92
+msgid "Cancel any modification"
+msgstr "取消所有修改"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:94
+#, fuzzy
+#| msgid "Move to next LDAP entry"
+msgid "Move to first entry"
+msgstr "前进到下个 LDAP 记录"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:95
+#, fuzzy
+#| msgid "Move back to previous LDAP entry"
+msgid "Move to previous entry"
+msgstr "后退到上个 LDAP 记录"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:96
+#, fuzzy
+#| msgid "Move to next LDAP entry"
+msgid "Move to next entry"
+msgstr "前进到下个 LDAP 记录"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:97
+#, fuzzy
+#| msgid "Move to next LDAP entry"
+msgid "Move to last entry"
+msgstr "前进到下个 LDAP 记录"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:99
+#, fuzzy
+#| msgid "Go to first chunck"
+msgid "Show first chunk of data"
+msgstr "转到第一个块"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:100
+#, fuzzy
+#| msgid "Go to previous chunck"
+msgid "Show previous chunk of data"
+msgstr "转到上一个块"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:101
+#, fuzzy
+#| msgid "Go to next chunck"
+msgid "Show next chunk of data"
+msgstr "转到下一下块"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:102
+#, fuzzy
+#| msgid "Go to last chunck"
+msgid "Show last chunk of data"
+msgstr "转到最后一个块"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:576
+#, fuzzy
+#| msgid "Filter"
+msgid "Filter data"
+msgstr "过滤器"
+
+#: ../libgda-ui/gdaui-data-proxy-info.c:876
+msgid "Undelete the selected entry"
+msgstr "取消删除选中的记录"
+
+#: ../libgda-ui/gdaui-data-selector.c:200
#, c-format
msgid "Invalid column number %d"
msgstr "无效的列号 %d"
-#: ../libgda-ui/gdaui-data-store.c:138
+#: ../libgda-ui/gdaui-data-store.c:109
msgid "Data model"
msgstr "数据模型"
-#: ../libgda-ui/gdaui-data-store.c:142
+#: ../libgda-ui/gdaui-data-store.c:113
msgid "Internal GdaDataProxy data model"
msgstr "内部 GdaDataProxy 数据模型"
-#: ../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
+#: ../libgda-ui/gdaui-data-store.c:361 ../libgda-ui/gdaui-data-store.c:429
+#: ../libgda-ui/gdaui-data-store.c:460 ../libgda-ui/gdaui-data-store.c:491
msgid "Can't modify row while data model is being reset"
msgstr "在数据模型正在重置时无法修改行"
-#: ../libgda-ui/gdaui-data-store.c:401
+#: ../libgda-ui/gdaui-data-store.c:375
msgid "Trying to modify a read-only row"
msgstr "试图修改只读的行"
-#: ../libgda-ui/gdaui-data-store.c:597
+#: ../libgda-ui/gdaui-data-store.c:577
msgid "Can't access row while data model is being reset"
msgstr "在数据模型正在重置时无法访问行"
-#: ../libgda-ui/gdaui-init.c:72
+#: ../libgda-ui/gdaui-init.c:55
+#, c-format
+msgid "Error parsing CSS: %s"
+msgstr "解析 CSS 时出错：%s"
+
+#: ../libgda-ui/gdaui-init.c:80
msgid "Attempt to initialize an already initialized library"
msgstr "试图初始化一个已初始化的库"
-#: ../libgda-ui/gdaui-init.c:512
+#: ../libgda-ui/gdaui-init.c:510
msgid "Could not open plugins directory, no plugin loaded."
msgstr "无法打开插件目录，没有已经加载的插件。"
-#: ../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:233
-#: ../tools/browser/query-exec/query-result.c:284 ../tools/web-server.c:2024
+#: ../libgda-ui/gdaui-init.c:530
+#: ../tools/browser/data-manager/data-widget.c:379
+#: ../tools/browser/data-manager/data-widget.c:384
+#: ../tools/browser/data-manager/data-widget.c:386
+#: ../tools/browser/data-manager/xml-spec-editor.c:225
+#: ../tools/browser/query-exec/query-result.c:284
+#: ../tools/common/web-server.c:1980
#, c-format
msgid "Error: %s"
msgstr "错误：%s"
-#: ../libgda-ui/gdaui-init.c:540
+#: ../libgda-ui/gdaui-init.c:538
#, c-format
msgid "Loading file %s...\n"
msgstr "正在加载文件 %s...\n"
-#: ../libgda-ui/gdaui-init.c:544
+#: ../libgda-ui/gdaui-init.c:542
#, c-format
msgid "Plugins load warning: %s"
msgstr "插件加载警告：%s"
#. radio buttons
-#: ../libgda-ui/gdaui-login.c:177
+#: ../libgda-ui/gdaui-login.c:173
msgid "Use data source:"
msgstr "使用数据源："
-#: ../libgda-ui/gdaui-login.c:185
+#: ../libgda-ui/gdaui-login.c:181
msgid "Specify connection:"
-msgstr "指定连接"
+msgstr "指定连接："
#. Create the DSN add button
-#: ../libgda-ui/gdaui-login.c:198
+#: ../libgda-ui/gdaui-login.c:194
msgid "Data sources..."
msgstr "数据源..."
-#: ../libgda-ui/gdaui-login.c:447
+#: ../libgda-ui/gdaui-login.c:419
msgid "Could not execute the Database access control center"
msgstr "无法执行数据库访问控制中心"
-#: ../libgda-ui/gdaui-raw-form.c:184 ../libgda-ui/gdaui-raw-grid.c:316
+#: ../libgda-ui/gdaui-raw-form.c:142 ../libgda-ui/gdaui-raw-grid.c:244
msgid "Data to display"
msgstr "要显示的数据"
-#: ../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:204 ../libgda-ui/gdaui-raw-grid.c:200
-msgid "Create a new record"
-msgstr "创建一个新记录"
-
-#: ../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:206 ../libgda-ui/gdaui-raw-grid.c:202
-msgid "Clear all the modifications"
-msgstr "清空所有修改"
-
-#: ../libgda-ui/gdaui-raw-form.c:207
-msgid "Go to first record"
-msgstr "转到第一条记录"
-
-#: ../libgda-ui/gdaui-raw-form.c:208
-msgid "Go to last record"
-msgstr "转到最后一条记录"
-
-#: ../libgda-ui/gdaui-raw-form.c:209
-msgid "Go to previous record"
-msgstr "转到上一条记录"
-
-#: ../libgda-ui/gdaui-raw-form.c:210
-msgid "Go to next record"
-msgstr "转到下一条记录"
-
-#: ../libgda-ui/gdaui-raw-form.c:211 ../libgda-ui/gdaui-raw-grid.c:207
-msgid "Filter records"
-msgstr "过滤记录"
-
-#: ../libgda-ui/gdaui-raw-form.c:630
+#: ../libgda-ui/gdaui-raw-form.c:216
#, c-format
msgid "Can't append row to data model: %s"
msgstr "无法追加列到数据模型：%s"
-#: ../libgda-ui/gdaui-raw-grid.c:203
-msgid "Go to first chunck"
-msgstr "转到第一个块"
-
-#: ../libgda-ui/gdaui-raw-grid.c:204
-msgid "Go to last chunck"
-msgstr "转到最后一个块"
-
-#: ../libgda-ui/gdaui-raw-grid.c:205
-msgid "Go to previous chunck"
-msgstr "转到上一个块"
-
-#: ../libgda-ui/gdaui-raw-grid.c:206
-msgid "Go to next chunck"
-msgstr "转到下一下块"
-
-#: ../libgda-ui/gdaui-raw-grid.c:321
+#: ../libgda-ui/gdaui-raw-grid.c:249
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:324
+#: ../libgda-ui/gdaui-raw-grid.c:252
msgid "Info cell visible"
msgstr "信息单元格可见"
-#: ../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:788 ../libgda-ui/gdaui-raw-grid.c:811
+#: ../libgda-ui/gdaui-raw-grid.c:677 ../libgda-ui/gdaui-raw-grid.c:699
msgid "Can't be NULL"
msgstr "不能是 NULL"
-#: ../libgda-ui/gdaui-raw-grid.c:819
+#: ../libgda-ui/gdaui-raw-grid.c:707
msgid "No title"
msgstr "无标题"
-#: ../libgda-ui/gdaui-raw-grid.c:1916
+#: ../libgda-ui/gdaui-raw-grid.c:1505
msgid "Shown columns"
msgstr "已显示的列"
-#: ../libgda-ui/gdaui-raw-grid.c:1948
+#: ../libgda-ui/gdaui-raw-grid.c:1532
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: ../libgda-ui/gdaui-raw-grid.c:1538
msgid "Select _All"
msgstr "全部选择(_A)"
-#: ../libgda-ui/gdaui-raw-grid.c:1953
+#: ../libgda-ui/gdaui-raw-grid.c:1543
msgid "_Clear Selection"
msgstr "清理选择(_C)"
-#: ../libgda-ui/gdaui-raw-grid.c:1956
+#: ../libgda-ui/gdaui-raw-grid.c:1546
msgid "Show Column _Titles"
msgstr "显示列标题(_T)"
-#: ../libgda-ui/gdaui-raw-grid.c:1961
-msgid "_Set filter"
-msgstr "设置过滤器(_S)"
-
-#: ../libgda-ui/gdaui-raw-grid.c:1964
-msgid "_Unset filter"
-msgstr "重设过滤器(_U)"
+#: ../libgda-ui/gdaui-raw-grid.c:1552
+#, fuzzy
+#| msgid "Save"
+msgid "Save _As"
+msgstr "保存"
#. create dialog box
-#: ../libgda-ui/gdaui-raw-grid.c:2152
+#: ../libgda-ui/gdaui-raw-grid.c:1731
msgid "Saving Data"
msgstr "保存数据"
-#: ../libgda-ui/gdaui-raw-grid.c:2160
+#: ../libgda-ui/gdaui-raw-grid.c:1739
msgid "Saving data to a file"
msgstr "保存数据到文件"
-#: ../libgda-ui/gdaui-raw-grid.c:2161
+#: ../libgda-ui/gdaui-raw-grid.c:1740
msgid "The data will be exported to the selected file."
msgstr "数据将导出到所选文件中。"
-#: ../libgda-ui/gdaui-raw-grid.c:2171 ../tools/config-info.c:426
+#: ../libgda-ui/gdaui-raw-grid.c:1750 ../tools/common/t-config-info.c:426
msgid "File name"
msgstr "文件名"
#. To translators: "Details" is a table's column's attribute
-#: ../libgda-ui/gdaui-raw-grid.c:2192
-#: ../tools/browser/schema-browser/table-columns.c:666
+#: ../libgda-ui/gdaui-raw-grid.c:1771
+#: ../tools/browser/schema-browser/table-columns.c:668
msgid "Details"
msgstr "细节"
#. file type
-#: ../libgda-ui/gdaui-raw-grid.c:2213
+#: ../libgda-ui/gdaui-raw-grid.c:1792
msgid "File type:"
msgstr "文件类型："
-#: ../libgda-ui/gdaui-raw-grid.c:2223
+#: ../libgda-ui/gdaui-raw-grid.c:1802
msgid "Tab-delimited"
msgstr "制表符分隔"
-#: ../libgda-ui/gdaui-raw-grid.c:2224
+#: ../libgda-ui/gdaui-raw-grid.c:1803
msgid "Comma-delimited"
msgstr "逗号分隔"
-#: ../libgda-ui/gdaui-raw-grid.c:2225
+#: ../libgda-ui/gdaui-raw-grid.c:1804
msgid "XML"
msgstr "XML"
#. data scope
-#: ../libgda-ui/gdaui-raw-grid.c:2232
+#: ../libgda-ui/gdaui-raw-grid.c:1811
msgid "Data to save:"
msgstr "要保存的数据："
-#: ../libgda-ui/gdaui-raw-grid.c:2247
+#: ../libgda-ui/gdaui-raw-grid.c:1826
msgid "All data (without any local modification)"
msgstr "所有数据(没有任何本地修改)"
-#: ../libgda-ui/gdaui-raw-grid.c:2248
+#: ../libgda-ui/gdaui-raw-grid.c:1827
msgid "Only displayed data"
msgstr "仅显示的数据"
-#: ../libgda-ui/gdaui-raw-grid.c:2250
+#: ../libgda-ui/gdaui-raw-grid.c:1829
msgid "Only selected data"
msgstr "仅选择的数据"
-#: ../libgda-ui/gdaui-raw-grid.c:2255
+#: ../libgda-ui/gdaui-raw-grid.c:1834
msgid "Other options"
msgstr "其他选项"
-#: ../libgda-ui/gdaui-raw-grid.c:2262
+#: ../libgda-ui/gdaui-raw-grid.c:1841
msgid "Empty string when NULL?"
msgstr "在 NULL 时使用空字符串？"
-#: ../libgda-ui/gdaui-raw-grid.c:2265 ../libgda-ui/gdaui-raw-grid.c:2270
+#: ../libgda-ui/gdaui-raw-grid.c:1844 ../libgda-ui/gdaui-raw-grid.c:1849
msgid "Export NULL values as an empty \"\" string"
msgstr "将 NULL 值导出为空 \"\" 字符串"
-#: ../libgda-ui/gdaui-raw-grid.c:2272
+#: ../libgda-ui/gdaui-raw-grid.c:1851
msgid "Invalid data as NULL?"
msgstr "无效的数据当作 NULL？"
-#: ../libgda-ui/gdaui-raw-grid.c:2275 ../libgda-ui/gdaui-raw-grid.c:2280
+#: ../libgda-ui/gdaui-raw-grid.c:1854 ../libgda-ui/gdaui-raw-grid.c:1859
msgid ""
"Don't export invalid data,\n"
"but export a NULL value instead"
@@ -4192,28 +4826,28 @@ msgstr ""
"不导出无效数据，\n"
"而是导出一个 NULL 值"
-#: ../libgda-ui/gdaui-raw-grid.c:2282
+#: ../libgda-ui/gdaui-raw-grid.c:1861
msgid "Field names on first row?"
msgstr "第一行为字段名？"
-#: ../libgda-ui/gdaui-raw-grid.c:2285 ../libgda-ui/gdaui-raw-grid.c:2290
+#: ../libgda-ui/gdaui-raw-grid.c:1864 ../libgda-ui/gdaui-raw-grid.c:1869
msgid "Add a row at beginning with columns names"
msgstr "在开头添加一个包含列名的行"
-#: ../libgda-ui/gdaui-raw-grid.c:2467
+#: ../libgda-ui/gdaui-raw-grid.c:2047
#, c-format
msgid "Could not save file %s"
msgstr "无法保存文件 %s"
-#: ../libgda-ui/gdaui-raw-grid.c:2475
+#: ../libgda-ui/gdaui-raw-grid.c:2055
msgid "You must specify a file name"
msgstr "您必须指定一个文件名"
-#: ../libgda-ui/gdaui-raw-grid.c:2481
+#: ../libgda-ui/gdaui-raw-grid.c:2061
msgid "Got empty file while converting the data"
msgstr "转换数据时获得了空文件"
-#: ../libgda-ui/gdaui-raw-grid.c:2494
+#: ../libgda-ui/gdaui-raw-grid.c:2074
#, c-format
msgid ""
"File '%s' already exists.\n"
@@ -4222,11 +4856,16 @@ msgstr ""
"文件 '%s' 已经存在。\n"
"确认要覆盖它吗？"
-#: ../libgda-ui/gdaui-raw-grid.c:2504
+#: ../libgda-ui/gdaui-raw-grid.c:2084
msgid "If you choose yes, the contents will be lost."
msgstr "如果您选择是，内容将丢失。"
-#: ../libgda-ui/gdaui-rt-editor.c:92
+#: ../libgda-ui/gdaui-raw-grid.c:2594 ../libgda-ui/gdaui-raw-grid.c:2649
+#, c-format
+msgid "The '%s' attribute should be a G_TYPE_STRING value"
+msgstr "“%s”属性应为 G_TYPE_STRING 值"
+
+#: ../libgda-ui/gdaui-rt-editor.c:102
msgid ""
"\"\"\"= Title level 1 =\n"
"== Title level 2 ==\n"
@@ -4276,138 +4915,139 @@ msgstr ""
"\n"
"原文区用三个半角双引号括起来，标记将不被解释"
-#: ../libgda-ui/gdaui-rt-editor.c:159
+#: ../libgda-ui/gdaui-rt-editor.c:169
msgid "_Bold"
msgstr "粗体(_B)"
-#: ../libgda-ui/gdaui-rt-editor.c:159
+#: ../libgda-ui/gdaui-rt-editor.c:169
msgid "Bold text"
msgstr "粗体文本"
-#: ../libgda-ui/gdaui-rt-editor.c:160
+#: ../libgda-ui/gdaui-rt-editor.c:170
msgid "_Italic"
msgstr "斜体(_I)"
-#: ../libgda-ui/gdaui-rt-editor.c:160
+#: ../libgda-ui/gdaui-rt-editor.c:170
msgid "Italic text"
msgstr "斜体文本"
-#: ../libgda-ui/gdaui-rt-editor.c:161
+#: ../libgda-ui/gdaui-rt-editor.c:171
msgid "_Underline"
msgstr "下划线(_U)"
-#: ../libgda-ui/gdaui-rt-editor.c:161
+#: ../libgda-ui/gdaui-rt-editor.c:171
msgid "Underline text"
msgstr "下划线文本"
-#: ../libgda-ui/gdaui-rt-editor.c:162
+#: ../libgda-ui/gdaui-rt-editor.c:172
msgid "_Strike through"
msgstr "删除线(_S)"
-#: ../libgda-ui/gdaui-rt-editor.c:162
+#: ../libgda-ui/gdaui-rt-editor.c:172
msgid "Strike through text"
msgstr "删除线文本"
-#: ../libgda-ui/gdaui-rt-editor.c:163
+#: ../libgda-ui/gdaui-rt-editor.c:173
msgid "_Syntax help"
msgstr "语法帮助(_S)"
-#: ../libgda-ui/gdaui-rt-editor.c:163
+#: ../libgda-ui/gdaui-rt-editor.c:173
msgid "Show syntax help"
msgstr "显示语法帮助"
-#: ../libgda-ui/gdaui-rt-editor.c:167
+#: ../libgda-ui/gdaui-rt-editor.c:177
msgid "_Add image"
msgstr "添加图像(_A)"
-#: ../libgda-ui/gdaui-rt-editor.c:167
+#: ../libgda-ui/gdaui-rt-editor.c:177
msgid "Insert image"
msgstr "插入图像"
-#: ../libgda-ui/gdaui-rt-editor.c:168
+#: ../libgda-ui/gdaui-rt-editor.c:178
msgid "_Normal text"
msgstr "正常文本(_N)"
-#: ../libgda-ui/gdaui-rt-editor.c:168
+#: ../libgda-ui/gdaui-rt-editor.c:178
msgid "Reset to normal text"
msgstr "重置为正常文本"
-#: ../libgda-ui/gdaui-rt-editor.c:243
+#: ../libgda-ui/gdaui-rt-editor.c:227
msgid "Don't display a specific background for the text"
msgstr "不显示文本的特定背景"
-#: ../libgda-ui/gdaui-rt-editor.c:253
+#: ../libgda-ui/gdaui-rt-editor.c:237
msgid "Display raw markup text instead of formatted text"
msgstr "显示原始的标记文本而非格式化文本"
-#: ../libgda-ui/gdaui-rt-editor.c:264
+#: ../libgda-ui/gdaui-rt-editor.c:248
msgid "The buffer which is displayed"
msgstr "所显示的缓存"
-#: ../libgda-ui/gdaui-rt-editor.c:275
+#: ../libgda-ui/gdaui-rt-editor.c:259
msgid "Determines if the contents appears in a scrolled window"
msgstr "确定内容是否在滚动窗口中显示"
-#: ../libgda-ui/gdaui-rt-editor.c:896
+#: ../libgda-ui/gdaui-rt-editor.c:899
msgid "Reset font size"
msgstr "重置字号"
-#: ../libgda-ui/gdaui-rt-editor.c:902
+#: ../libgda-ui/gdaui-rt-editor.c:905
msgid "Decrease font size (zoom out)"
msgstr "减小字号(缩小)"
-#: ../libgda-ui/gdaui-rt-editor.c:908
+#: ../libgda-ui/gdaui-rt-editor.c:911
msgid "Increase font size (zoom in)"
msgstr "增加字号(放大)"
-#: ../libgda-ui/gdaui-rt-editor.c:914
+#: ../libgda-ui/gdaui-rt-editor.c:917
msgid "Show source markup"
msgstr "显示源标记"
-#: ../libgda-ui/gdaui-server-operation.c:199
+#: ../libgda-ui/gdaui-server-operation.c:170
msgid "The specification of the operation to implement"
msgstr "要实现的操作规范"
-#: ../libgda-ui/gdaui-server-operation.c:205
+#: ../libgda-ui/gdaui-server-operation.c:176
msgid "Request section header to be hidden if there is only one section"
msgstr "若只有一节，要求节标题隐藏"
+#: ../libgda-ui/gdaui-server-operation.c:369
+#, c-format
+msgid "Mal formed Server Operation. No Node at path: '%s'"
+msgstr ""
+
+#: ../libgda-ui/gdaui-server-operation.c:442
+msgid "Add a new field"
+msgstr "添加一个新字段"
+
+#: ../libgda-ui/gdaui-server-operation.c:445
+msgid "Remove selected field"
+msgstr "移除选中的字段"
+
#. last row is for new entries
-#: ../libgda-ui/gdaui-server-operation.c:596
-#: ../tools/browser/data-manager/data-console.c:393
+#: ../libgda-ui/gdaui-server-operation.c:577
+#: ../tools/browser/data-manager/data-console.c:391
msgid "Add"
msgstr "添加"
-#: ../libgda-ui/gdaui-server-operation.c:1093
+#: ../libgda-ui/gdaui-server-operation.c:1070
msgid "Server operation specification"
msgstr "服务器操作规范"
-#: ../libgda-ui/gdaui-server-operation.c:1150
-msgid "<b>Field properties:</b>"
-msgstr "<b>字段属性：</b>"
-
-#: ../libgda-ui/gdaui-server-operation.c:1169
-msgid "<b>Fields:</b>"
-msgstr "<b>字段:</b>"
-
-#: ../libgda-ui/gdaui-server-operation.c:1218
-msgid "Add a new field"
-msgstr "添加一个新字段"
-
-#: ../libgda-ui/gdaui-server-operation.c:1220
-msgid "Remove selected field"
-msgstr "移除选中的字段"
+#: ../libgda-ui/gdaui-set.c:730
+msgid "No group exists for Set"
+msgstr ""
-#: ../libgda-ui/gdaui-tree-store.c:272
+#: ../libgda-ui/gdaui-tree-store.c:223
msgid "GdaTree to use"
msgstr "要使用的 GdaTree"
-#: ../libgda-ui/gdaui-tree-store.c:739
+#: ../libgda-ui/gdaui-tree-store.c:673
#, c-format
msgid "Unknown column number %d"
msgstr "未知的列名 %d"
-#: ../libgda-ui/gdaui-tree-store.c:759
+#: ../libgda-ui/gdaui-tree-store.c:693
#, c-format
msgid "Type mismatch: expected a value of type %s and got of type %s"
msgstr "类型不匹配：应为 %s 类型，而得到了 %s 类型"
@@ -4427,25 +5067,25 @@ msgid "Provider '%s' does not report the required parameters for DSN"
msgstr "提供者 '%s' 不为 DSN 报告需要的参数"
#. set to NULL item
-#: ../libgda-ui/internal/utility.c:81
+#: ../libgda-ui/internal/utility.c:82
msgid "Unset"
msgstr "未设置"
#. default value item
-#: ../libgda-ui/internal/utility.c:94
+#: ../libgda-ui/internal/utility.c:95
msgid "Set to default value"
msgstr "设置为默认值"
#. reset to original value item
-#: ../libgda-ui/internal/utility.c:107
+#: ../libgda-ui/internal/utility.c:108
msgid "Reset to original value"
msgstr "重设到先前的值"
-#: ../libgda-ui/internal/utility.c:374
+#: ../libgda-ui/internal/utility.c:375
msgid "Current modified data is invalid"
msgstr "当前修改的值无效"
-#: ../libgda-ui/internal/utility.c:376
+#: ../libgda-ui/internal/utility.c:377
msgid ""
"You may now choose to correct it, or to discard the modifications.\n"
"\n"
@@ -4455,28 +5095,32 @@ msgstr ""
"\n"
"您要怎样做？"
-#: ../libgda-ui/internal/utility.c:380
+#: ../libgda-ui/internal/utility.c:381
msgid "please correct it and try again, or discard the modifications."
msgstr "请修改它并重新尝试，或者丢弃修改。"
-#: ../libgda-ui/internal/utility.c:387
+#: ../libgda-ui/internal/utility.c:388
msgid "Part of the current modified data was invalid"
msgstr "当前修改的数据一部分是无效的"
-#: ../libgda-ui/internal/utility.c:388
+#: ../libgda-ui/internal/utility.c:389
msgid ""
"As no transaction was used, only a part of the valid data\n"
"has been written, and the remaining modification have been discarded."
msgstr "由于没有使用事务，只写入了部分的有效数据，剩余的修改已丢弃。"
-#: ../libgda-ui/internal/utility.c:432
+#: ../libgda-ui/internal/utility.c:433
msgid "Discard modified data"
msgstr "丢弃已经修改的数据"
-#: ../libgda-ui/internal/utility.c:433
+#: ../libgda-ui/internal/utility.c:434
msgid "Correct data first"
msgstr "首先修正数据"
+#: ../libgda-ui/internal/utility.c:499
+msgid "Ok"
+msgstr ""
+
#: ../providers/bdb/bdb_specs_dsn.xml.in.h:1
msgid "Database file"
msgstr "数据库文件"
@@ -4531,6 +5175,7 @@ msgstr "存储数据库文件的目录"
#: ../providers/sqlite/sqlite_specs_drop_db.xml.in.h:4
#: ../providers/sqlite/sqlite_specs_dsn.xml.in.h:1
#: ../providers/web/web_specs_dsn.xml.in.h:8
+#: ../tools/common/t-connection.c:2466
msgid "Database name"
msgstr "数据库名"
@@ -4538,24 +5183,24 @@ msgstr "数据库名"
msgid "Name of the database in the database file to be used"
msgstr "要使用的数据库文件中的数据库的名称"
-#: ../providers/bdb/gda-bdb-provider.c:189
+#: ../providers/bdb/gda-bdb-provider.c:188
msgid "The DB_NAME parameter is not defined in the connection string."
msgstr "连接字符串中没有定义 DB_NAME 参数。"
-#: ../providers/bdb/gda-bdb-provider.c:219
+#: ../providers/bdb/gda-bdb-provider.c:218
msgid "An error occurred while accessing the BDB database"
msgstr "访问 BDB 数据库时出错"
-#: ../providers/bdb/gda-bdb-provider.c:227
+#: ../providers/bdb/gda-bdb-provider.c:226
#, c-format
msgid "Could not add BDB data model to connection: %s"
msgstr "无法添加 BDB 数据模型到连接：%s"
-#: ../providers/bdb/gda-bdb-provider.c:238
+#: ../providers/bdb/gda-bdb-provider.c:237
msgid "-"
msgstr "-"
-#: ../providers/bdb/libmain.c:75
+#: ../providers/bdb/libmain.c:76
msgid "Provider for Berkeley databases"
msgstr "Berkeley 数据库提供者"
@@ -4589,14 +5234,13 @@ msgstr "列描述"
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:2
#: ../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:973
+#: ../tools/browser/data-manager/data-source-editor.c:174
+#: ../tools/browser/schema-browser/table-info.c:372
msgid "Table"
msgstr "表"
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:3
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:3
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:3
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:3
#: ../providers/mysql/mysql_specs_comment_column.xml.in.h:3
#: ../providers/mysql/mysql_specs_comment_table.xml.in.h:3
@@ -4616,14 +5260,13 @@ msgstr "表名"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:4
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:10
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:7
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:4
#: ../providers/mysql/mysql_specs_comment_column.xml.in.h:4
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:13
#: ../providers/mysql/mysql_specs_drop_column.xml.in.h:4
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:7
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:6
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:17
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:8
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:18
#: ../providers/postgres/postgres_specs_drop_column.xml.in.h:4
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:4
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:10
@@ -4632,13 +5275,28 @@ msgstr "表名"
msgid "Field name"
msgstr "字段名"
+#. list of fields
+#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:5
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:12
+#: ../providers/mysql/mysql_specs_add_column.xml.in.h:9
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:15
+#: ../providers/oracle/oracle_specs_create_table.xml.in.h:9
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:9
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:20
+#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:5
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:12
+#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:5
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:12
+msgid "Data type"
+msgstr "数据类型"
+
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:6
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:14
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:10
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:17
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:8
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:21
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:12
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:22
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:6
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:14
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:6
@@ -4651,8 +5309,8 @@ msgstr "大小"
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:16
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:11
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:19
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:9
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:23
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:13
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:24
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:7
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:16
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:7
@@ -4663,12 +5321,11 @@ msgstr "范围"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:8
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:18
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:11
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:12
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:21
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:11
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:10
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:25
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:14
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:26
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:8
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:18
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:8
@@ -4676,23 +5333,6 @@ msgstr "范围"
msgid "Not NULL"
msgstr "非 NULL"
-#. list of fields
-#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:9
-#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:26
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:17
-#: ../providers/mysql/mysql_specs_add_column.xml.in.h:16
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:29
-#: ../providers/oracle/oracle_specs_create_table.xml.in.h:17
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:13
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:33
-#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:9
-#: ../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:665 ../tools/web-server.c:935
-msgid "Default"
-msgstr "默认"
-
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:10
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:10
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:10
@@ -4702,12 +5342,11 @@ msgstr "默认值，如果列是 NOT NULL，则是必须要有"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:11
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:30
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:21
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:18
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:33
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:21
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:15
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:37
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:19
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:38
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:11
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:30
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:11
@@ -4718,12 +5357,11 @@ msgstr "检查"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_add_column.xml.in.h:12
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:32
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:23
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:19
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:35
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:23
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:16
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:39
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:20
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:40
#: ../providers/sqlcipher/sqlcipher_specs_add_column.xml.in.h:12
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:32
#: ../providers/sqlite/sqlite_specs_add_column.xml.in.h:12
@@ -4781,9 +5419,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:645
-#: ../tools/command-exec.c:587 ../tools/command-exec.c:663
-#: ../tools/web-server.c:933
+#: ../tools/browser/schema-browser/table-columns.c:647
+#: ../tools/common/t-app.c:1761 ../tools/common/t-app.c:1837
+#: ../tools/common/web-server.c:850
msgid "Type"
msgstr "类型"
@@ -4794,7 +5432,6 @@ msgstr "类型"
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:3
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:2
#: ../providers/bdbsql/bdbsql_specs_create_view.xml.in.h:2
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:2
#: ../providers/mysql/mysql_specs_create_index.xml.in.h:3
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:2
#: ../providers/mysql/mysql_specs_create_view.xml.in.h:2
@@ -4812,11 +5449,12 @@ msgstr "类型"
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:3
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:2
#: ../providers/sqlite/sqlite_specs_create_view.xml.in.h:2
-#: ../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:586 ../tools/gda-sql.c:2977 ../tools/gda-sql.c:3274
-#: ../tools/gda-sql.c:3991 ../tools/gda-sql.c:4031
+#: ../tools/browser/data-manager/data-favorite-selector.c:296
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:297
+#: ../tools/browser/query-exec/query-favorite-selector.c:350
+#: ../tools/common/t-app.c:1760 ../tools/common/t-app.c:2255
+#: ../tools/common/t-app.c:2326 ../tools/common/t-app.c:2901
+#: ../tools/common/t-app.c:3733 ../tools/common/t-app.c:3815
msgid "Name"
msgstr "名称"
@@ -4843,6 +5481,9 @@ msgstr "表中"
#: ../providers/bdbsql/bdbsql_specs_create_view.xml.in.h:5
#: ../providers/mysql/mysql_specs_create_db.xml.in.h:24
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:5
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:10
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:10
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:6
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:6
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:5
#: ../providers/sqlcipher/sqlcipher_specs_create_view.xml.in.h:5
@@ -4853,6 +5494,7 @@ msgid "Only if it does not yet exist"
msgstr "只在尚未存在时"
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:7
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:11
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:7
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:7
msgid "Create index only if it does not yet exist"
@@ -4861,7 +5503,7 @@ msgstr "只有不存在时才创建索引"
#. Index fields
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:9
#: ../providers/mysql/mysql_specs_create_index.xml.in.h:9
-#: ../providers/postgres/postgres_specs_create_index.xml.in.h:11
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:13
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:9
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:9
msgid "Indexed field(s)"
@@ -4870,15 +5512,18 @@ msgstr "索引的字段"
#. Index fields
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:11
#: ../providers/mysql/mysql_specs_create_index.xml.in.h:11
-#: ../providers/postgres/postgres_specs_create_index.xml.in.h:13
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:15
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:11
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:11
msgid "Indexed field or expression"
msgstr "已索引的字段或表达式"
+#. To translators: "Compare method" refers to the method SQLite has to compare values
+#. Index fields
#. To translators: "Compare method" refers to the method SQLite has to compare values
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:13
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:34
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:17
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:13
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:34
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:13
@@ -4899,13 +5544,13 @@ msgstr "排序规则名称(BINARY|NOCASE)"
#. Index fields
#: ../providers/bdbsql/bdbsql_specs_create_index.xml.in.h:17
#: ../providers/mysql/mysql_specs_create_index.xml.in.h:17
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:21
#: ../providers/sqlcipher/sqlcipher_specs_create_index.xml.in.h:17
#: ../providers/sqlite/sqlite_specs_create_index.xml.in.h:17
msgid "Sort type"
msgstr "排序类型"
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:1
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:1
#: ../providers/mysql/mysql_specs_comment_table.xml.in.h:1
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:1
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:1
@@ -4918,7 +5563,7 @@ msgstr "表的描述"
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:4
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:4
#: ../providers/mysql/mysql_specs_drop_table.xml.in.h:3
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:6
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:5
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:4
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:4
msgid "Temporary table"
@@ -4926,6 +5571,7 @@ msgstr "临时表"
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:6
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:6
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:7
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:6
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:6
msgid "Create table only if it does not yet exist"
@@ -4933,10 +5579,9 @@ msgstr "只创建尚不存在的表"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:8
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:5
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:11
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:5
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:15
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:16
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:8
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:8
msgid "Table's columns"
@@ -4946,57 +5591,53 @@ msgstr "表列"
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:20
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:13
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:23
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:27
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:28
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:20
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:20
-#: ../tools/command-exec.c:516 ../tools/command-exec.c:519
-#: ../tools/web-server.c:905 ../tools/web-server.c:908
+#: ../tools/common/t-app.c:1864 ../tools/common/web-server.c:867
msgid "Auto increment"
msgstr "自动增量"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:22
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:13
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:14
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:25
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:13
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:11
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:15
#: ../providers/postgres/postgres_specs_create_index.xml.in.h:4
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:29
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:30
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:22
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:22
-#: ../tools/command-exec.c:821
+#: ../tools/common/t-app.c:1991
msgid "Unique"
msgstr "唯一"
#. list of fields
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:24
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:15
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:15
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:27
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:15
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:12
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:31
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:16
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:32
#: ../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:231
-#: ../tools/command-exec.c:774
+#: ../tools/browser/schema-browser/table-columns.c:233
+#: ../tools/common/t-app.c:1944
msgid "Primary key"
msgstr "主键"
#. list of fields
#. To translators: "Default value" is a table's column's attribute
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:28
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:19
#: ../providers/mysql/mysql_specs_add_column.xml.in.h:17
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:31
#: ../providers/oracle/oracle_specs_create_table.xml.in.h:19
-#: ../providers/postgres/postgres_specs_add_column.xml.in.h:14
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:35
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:18
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:36
#: ../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:659
+#: ../tools/browser/schema-browser/table-columns.c:661
msgid "Default value"
msgstr "默认值"
@@ -5014,14 +5655,106 @@ msgstr "冲突"
msgid "Conflict resolution method (ROLLBACK|ABORT|FAIL|IGNORE|REPLACE)"
msgstr "冲突解决方法(ROLLBACK|ABORT|FAIL|IGNORE|REPLACE)"
-#. other table constraints
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:41
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:37
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:42
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:41
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:41
+#: ../tools/browser/canvas/browser-canvas-fkey.c:422
+#: ../tools/browser/schema-browser/mgr-columns.c:385
+#: ../tools/common/t-app.c:2051
+msgid "Foreign key"
+msgstr "外键"
+
+#. foreign key spec
#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:42
-#: ../providers/jdbc/jdbc_specs_create_table.xml.in.h:25
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:57
-#: ../providers/oracle/oracle_specs_create_table.xml.in.h:25
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:63
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:39
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:44
#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:42
#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:42
+msgid "Referenced table"
+msgstr "引用的表"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:43
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:41
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:46
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:43
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:43
+msgid "Fields"
+msgstr "字段"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:44
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:43
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:48
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:44
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:44
+msgid "Fields in the foreign key"
+msgstr "外键中的字段"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:45
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:45
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:50
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:45
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:45
+msgid "Field"
+msgstr "字段"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:46
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:47
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:52
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:46
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:46
+msgid "Referenced field"
+msgstr "引用的字段"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:47
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:49
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:54
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:47
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:47
+msgid "Match type"
+msgstr "匹配类型"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:48
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:51
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:56
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:48
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:48
+msgid "Matching method if more than one field involved"
+msgstr "涉及多于一个字段时的匹配方法"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:49
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:53
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:58
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:49
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:49
+msgid "On update action"
+msgstr "在更新操作时"
+
+#. foreign key spec
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:50
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:55
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:60
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:50
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:50
+msgid "On delete action"
+msgstr "在删除操作时"
+
+#. other table constraints
+#: ../providers/bdbsql/bdbsql_specs_create_table.xml.in.h:52
+#: ../providers/mysql/mysql_specs_create_table.xml.in.h:57
+#: ../providers/oracle/oracle_specs_create_table.xml.in.h:25
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:64
+#: ../providers/sqlcipher/sqlcipher_specs_create_table.xml.in.h:52
+#: ../providers/sqlite/sqlite_specs_create_table.xml.in.h:52
msgid "Global constraints"
msgstr "全局限制"
@@ -5054,14 +5787,6 @@ msgstr "临时视图"
msgid "Create view only if it does not yet exist"
msgstr "只要尚未存在时创建视图"
-#: ../providers/bdbsql/bdbsql_specs_create_view.xml.in.h:7
-#: ../providers/mysql/mysql_specs_create_view.xml.in.h:6
-#: ../providers/postgres/postgres_specs_create_view.xml.in.h:7
-#: ../providers/sqlcipher/sqlcipher_specs_create_view.xml.in.h:7
-#: ../providers/sqlite/sqlite_specs_create_view.xml.in.h:7
-msgid "Definition"
-msgstr "定义"
-
#: ../providers/bdbsql/bdbsql_specs_create_view.xml.in.h:8
#: ../providers/mysql/mysql_specs_create_view.xml.in.h:7
#: ../providers/postgres/postgres_specs_create_view.xml.in.h:8
@@ -5075,8 +5800,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:172
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:178
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:169
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:174
msgid "Index"
msgstr "索引"
@@ -5131,6 +5856,7 @@ msgstr "只有表存在时才丢弃(drop)"
#: ../providers/postgres/postgres_specs_drop_view.xml.in.h:1
#: ../providers/sqlcipher/sqlcipher_specs_drop_view.xml.in.h:1
#: ../providers/sqlite/sqlite_specs_drop_view.xml.in.h:1
+#: ../tools/browser/schema-browser/table-info.c:375
msgid "View"
msgstr "查看"
@@ -5253,13 +5979,15 @@ msgstr "新名称"
msgid "New table name"
msgstr "新表名"
-#: ../providers/bdbsql/libmain.c:51
+#: ../providers/bdbsql/libmain.c:55
msgid "Can't find libdb_sql-5."
-msgstr "找不到 libdb_sql-5"
+msgstr "找不到 libdb_sql-5。"
-#: ../providers/bdbsql/libmain.c:89
-msgid "Provider for BDB SQL databases"
-msgstr "BDB SQL 数据库的提供者"
+#: ../providers/bdbsql/libmain.c:93
+#, fuzzy
+#| msgid "Provider for Berkeley databases"
+msgid "Provider for Berkeley DB SQL databases"
+msgstr "Berkeley 数据库提供者"
#: ../providers/firebird/firebird_specs_dsn_emb.xml.in.h:2
msgid "The name of a database to connect to (without the .fdb)"
@@ -5269,24 +5997,29 @@ msgstr "要连接的数据库的名字(不带 .db)"
msgid "Provider for Firebird databases"
msgstr "Firebird 数据库的提供者"
-#: ../providers/firebird/libmain-embed.c:69
+#: ../providers/firebird/libmain-embed.c:70
msgid "Provider for embedded Firebird databases"
msgstr "嵌入式 Firebird 数据库的提供者"
-#: ../providers/jdbc/GdaInputStream.c:48
-#: ../providers/jdbc/GdaInputStream.c:122 ../providers/jdbc/GdaJValue.c:207
-#: ../providers/jdbc/GdaJValue.c:250 ../providers/jdbc/GdaJValue.c:298
-#: ../providers/jdbc/GdaJValue.c:345 ../providers/jdbc/GdaJValue.c:388
-#: ../providers/jdbc/GdaJValue.c:515
+#: ../providers/jdbc/GdaInputStream.c:48 ../providers/jdbc/GdaInputStream.c:124
+#: ../providers/jdbc/GdaJValue.c:207 ../providers/jdbc/GdaJValue.c:247
+#: ../providers/jdbc/GdaJValue.c:289 ../providers/jdbc/GdaJValue.c:337
+#: ../providers/jdbc/GdaJValue.c:383 ../providers/jdbc/GdaJValue.c:512
msgid "Invalid argument: NULL"
msgstr "无效的参数：NULL"
-#: ../providers/jdbc/GdaInputStream.c:68
-#: ../providers/jdbc/GdaInputStream.c:141
+#: ../providers/jdbc/GdaInputStream.c:70 ../providers/jdbc/GdaInputStream.c:145
msgid "Can't read BLOB"
msgstr "无法读取 BLOB"
-#: ../providers/jdbc/gda-jdbc-provider.c:493
+#: ../providers/jdbc/gda-jdbc-ddl.c:157 ../providers/mysql/gda-mysql-ddl.c:343
+#: ../providers/oracle/gda-oracle-ddl.c:157
+#: ../providers/postgres/gda-postgres-ddl.c:403
+#: ../providers/web/gda-web-ddl.c:155
+msgid "Table to create must have at least one row"
+msgstr "要创建的表必须至少有一行"
+
+#: ../providers/jdbc/gda-jdbc-provider.c:499
msgid "Missing parameters to open database connection"
msgstr "缺少打开数据库连接的参数"
@@ -5295,7 +6028,7 @@ msgstr "缺少打开数据库连接的参数"
msgid "Invalid date: year %d, month %d and day %d"
msgstr "无效日期：年 %d，月 %d，日 %d"
-#: ../providers/jdbc/GdaJValue.c:409
+#: ../providers/jdbc/GdaJValue.c:406
msgid "Can't get BLOB's size"
msgstr "无法获取 BLOB 大小"
@@ -5355,102 +6088,157 @@ msgstr "连接 URL"
msgid ""
"Connection string required by the JDBC driver, refer to the used JDBC driver "
"for its contents and format"
-msgstr "JDBC 驱动要求的连接字符串，请查阅使用的 JDBC 驱动了解它的内容和格式。"
+msgstr "JDBC 驱动所需的连接字符串，请查阅使用的 JDBC 驱动了解它的内容和格式"
-#: ../providers/jdbc/libmain.c:153 ../providers/jdbc/libmain.c:163
+#: ../providers/jdbc/libmain.c:154 ../providers/jdbc/libmain.c:164
#, c-format
msgid "Can't get list of installed JDBC drivers: %s"
msgstr "无法获得已安装的 JDBC 驱动程序的列表：%s"
-#: ../providers/jdbc/libmain.c:479
+#: ../providers/jdbc/libmain.c:504
+#, fuzzy
+#| msgid ""
+#| "Could not find the JVM runtime (libjvm.so), JDBC provider is unavailable."
+msgid ""
+"Could not find Libgda's JAR (gdaprovider-6.0.jar), JDBC provider is "
+"unavailable."
+msgstr "找不到 JVM 运行时(libjvm.so)，JDBC 提供者无法使用。"
+
+#: ../providers/jdbc/libmain.c:513
#, c-format
msgid "Can't create JAVA virtual machine: %s"
msgstr "无法创建 JAVA 虚拟机：%s"
-#: ../providers/jdbc/libmain.c:487
+#: ../providers/jdbc/libmain.c:523
msgid ""
"Could not find the JVM runtime (libjvm.so), JDBC provider is unavailable."
msgstr "找不到 JVM 运行时(libjvm.so)，JDBC 提供者无法使用。"
-#: ../providers/ldap/gda-ldap-provider.c:403
+#. dummy setup to enable GIR compilation
+#: ../providers/ldap/gda-data-model-ldap.c:156
+msgid ""
+"Dummy GdaDataModelLdap object: if you see this message in your application "
+"then it's likely that there is an installation problem with the LDAP "
+"provider. In any case the GdaDataModelLdap object won't be useable."
+msgstr ""
+"哑 GdaDataModelLdap 对象：如果您在应用程序中看到此消息，很可能 LDAP 提供程序"
+"安装出了问题。无论如何，GdaDataModelLdap 对象将不可用。"
+
+#: ../providers/ldap/gda-ldap-connection.c:128
+#, c-format
+msgid "Error storing list of created LDAP tables: %s"
+msgstr "保存创建的 LDAP 表的列表失败：%s"
+
+#: ../providers/ldap/gda-ldap-connection.c:213
+msgid "File used to store startup data"
+msgstr "用于存储启动数据的文件"
+
+#: ../providers/ldap/gda-ldap-connection.c:260
+#, c-format
+msgid "Error recreating LDAP tables: %s"
+msgstr "重建 LDAP 表出错：%s"
+
+#: ../providers/ldap/gda-ldap-connection.c:762
+msgid "Can't remove non LDAP virtual table"
+msgstr "无法移除非 LDAP 的虚拟表"
+
+#: ../providers/ldap/gda-ldap-connection.c:811
+msgid "Can't describe non LDAP virtual table"
+msgstr "无法描述非 LDAP 的虚拟表"
+
+#: ../providers/ldap/gda-ldap-connection.c:818
+msgid "Unknown LDAP virtual table"
+msgstr "未知的 LDAP 虚拟表"
+
+#: ../providers/ldap/gda-ldap-provider.c:371
msgid "The connection string must contain the DB_NAME value"
msgstr "连接字符串必须包含 DB_NAME 值"
-#: ../providers/ldap/gda-ldap-provider.c:444
+#: ../providers/ldap/gda-ldap-provider.c:412
msgid "Invalid value for 'TLS_REQCERT'"
msgstr "“TLS_REQCERT”的值无效"
-#: ../providers/ldap/gda-ldap-provider.c:878 ../tools/gda-sql.c:2825
-#: ../tools/gda-sql.c:4818 ../tools/gda-sql.c:5545 ../tools/gda-sql.c:5848
+#: ../providers/ldap/gda-ldap-provider.c:930 ../tools/common/t-app.c:2749
+#: ../tools/common/t-app.c:4476 ../tools/common/t-app.c:4593
#, c-format
msgid "Too many arguments"
msgstr "参数过多"
-#: ../providers/ldap/gda-ldap-provider.c:1030
+#: ../providers/ldap/gda-ldap-provider.c:1073
+#: ../providers/mysql/gda-mysql-provider.c:621
+#: ../providers/mysql/gda-mysql-provider.c:675
+#: ../providers/mysql/gda-mysql-util.c:63
+#: ../tools/browser/ldap-browser/entry-properties.c:587
+#: ../tools/browser/schema-browser/table-columns.c:519
+#: ../tools/browser/ui-support.c:70 ../tools/common/t-utils.c:41
+msgid "Unknown"
+msgstr "未知"
+
+#: ../providers/ldap/gda-ldap-provider.c:1086
msgid "Parameter"
msgstr "参数"
-#: ../providers/ldap/gda-ldap-provider.c:1244
+#: ../providers/ldap/gda-ldap-provider.c:1300
#, c-format
msgid "near \"%s\": syntax error"
msgstr "在“%s”附近：语法错误"
-#: ../providers/ldap/gda-ldap-util.c:1255
+#: ../providers/ldap/gda-ldap-util.c:1381
#, c-format
msgid "LDAP server returned more than one entry with DN '%s'"
msgstr "LDAP 服务器返回了多于一条 DN 为“%s”的记录"
-#: ../providers/ldap/gda-ldap-util.c:1397
+#: ../providers/ldap/gda-ldap-util.c:1568
msgid "Could not parse distinguished name returned by LDAP server"
msgstr "无法解析 LDAP 服务器返回的可区别名称"
-#: ../providers/ldap/gda-ldap-util.c:1639
+#: ../providers/ldap/gda-ldap-util.c:1862
#, c-format
msgid "Unexpected data type '%s' for objectClass attribute!"
msgstr "objectClass 属性的数据类型“%s”异常！"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:218
-#: ../providers/ldap/gdaprov-data-model-ldap.c:419
-#: ../providers/ldap/gdaprov-data-model-ldap.c:434
+#: ../providers/ldap/gda-tree-mgr-ldap.c:210
+#: ../tools/browser/ldap-browser/mgr-ldap-classes.c:187
+#: ../tools/browser/ldap-browser/mgr-ldap-classes.c:275
+#, c-format
+msgid "No LDAP connection specified"
+msgstr "没有指定 LDAP 连接"
+
+#: ../providers/ldap/gdaprov-data-model-ldap.c:239
+#: ../providers/ldap/gdaprov-data-model-ldap.c:445
+#: ../providers/ldap/gdaprov-data-model-ldap.c:460
msgid "Distinguished name"
msgstr "可区别的名称"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:416
-#: ../providers/ldap/gdaprov-data-model-ldap.c:431
+#: ../providers/ldap/gdaprov-data-model-ldap.c:442
+#: ../providers/ldap/gdaprov-data-model-ldap.c:457
msgid "Relative distinguished name"
msgstr "相对可区别的名称"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:902
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1199
+#: ../providers/ldap/gdaprov-data-model-ldap.c:885
+#, c-format
+msgid "Multiple value LDAP attribute does not fit into a single value"
+msgstr ""
+
+#: ../providers/ldap/gdaprov-data-model-ldap.c:931
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1312
msgid "Truncated result because LDAP server limit encountered"
msgstr "结果被截断，因为达到了 LDAP 服务器限制"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1583
-#, c-format
-msgid "Unknown GdaLdapModificationType %d"
-msgstr "未知的 GdaLdapModificationType %d"
-
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1590
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1925
msgid "No GdaLdapEntry specified"
msgstr "未指定 GdaLdapEntry"
-#: ../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:1602
-msgid "No GdaLdapEntry specified to define attributes to remove"
-msgstr "没有为定义待移除的属性指定 GdaLdapEntry"
-
-#: ../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:1937
+#, c-format
+msgid "Unknown GdaLdapModificationType %d"
+msgstr "未知的 GdaLdapModificationType %d"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1614
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1943
msgid "No GdaLdapEntry specified to compare attributes"
msgstr "没有为比较属性指定 GdaLdapEntry"
-#: ../providers/ldap/gdaprov-data-model-ldap.c:1619
+#: ../providers/ldap/gdaprov-data-model-ldap.c:1947
msgid "GdaLdapEntry specified to compare have different DN"
msgstr "指定的待比较的 GdaLdapEntry 具有不同的 DN"
@@ -5563,14 +6351,14 @@ msgstr "尝试：要求证书，接受无证书，否则进行检查。"
msgid "Demand: certificate requested and checked"
msgstr "要求：要求证书并进行检查"
-#: ../providers/ldap/libmain.c:75
+#: ../providers/ldap/libmain.c:70
msgid ""
"Provider for database where tables are based on data contained in an LDAP "
"directory"
msgstr "一类数据库的提供者，这类数据库中的表是基于包含在 LDAP 目录中的数据的"
-#: ../providers/mdb/gda-mdb-provider.c:303
-#: ../providers/mdb/gda-mdb-provider.c:310
+#: ../providers/mdb/gda-mdb-provider.c:302
+#: ../providers/mdb/gda-mdb-provider.c:309
#, c-format
msgid ""
"The connection string format has changed: replace FILENAME with DB_DIR (the "
@@ -5580,17 +6368,17 @@ msgstr ""
"连接字符串的格式已经改变：使用 DB_DIR (数据库文件的路径) and DB_NAME (结尾不"
"带 '%s' 的数据库文件) 替代了 FILENAME。"
-#: ../providers/mdb/gda-mdb-provider.c:337
+#: ../providers/mdb/gda-mdb-provider.c:336
#, c-format
msgid "Could not open file %s"
msgstr "无法打开文件 %s"
-#: ../providers/mdb/gda-mdb-provider.c:373
+#: ../providers/mdb/gda-mdb-provider.c:372
#, c-format
msgid "Could not map table '%s': %s"
msgstr "无法映射表 '%s'：%s"
-#: ../providers/mdb/libmain.c:72
+#: ../providers/mdb/libmain.c:73
msgid "Provider for Microsoft Access files"
msgstr "Microsoft Access 文件的提供者"
@@ -5598,141 +6386,126 @@ msgstr "Microsoft Access 文件的提供者"
msgid "The name of a database to use (filename without the .mdb)"
msgstr "要使用的数据库的名字 (不带 .mdb 的文件名)"
-#: ../providers/mysql/gda-mysql-ddl.c:263
-#: ../providers/postgres/gda-postgres-ddl.c:278
-msgid "No field specified in foreign key constraint"
-msgstr "在外键约束中没有指定字段"
-
-#: ../providers/mysql/gda-mysql-ddl.c:280
-#: ../providers/postgres/gda-postgres-ddl.c:295
-msgid "Empty field specified in foreign key constraint"
-msgstr "在外键约束中指定了空字段"
-
-#: ../providers/mysql/gda-mysql-ddl.c:295
-#: ../providers/postgres/gda-postgres-ddl.c:312
-msgid "No referenced table specified in foreign key constraint"
-msgstr "在外键约束中没有指定引用表"
-
-#: ../providers/mysql/gda-mysql-ddl.c:313
-#: ../providers/postgres/gda-postgres-ddl.c:330
-msgid "Empty referenced field specified in foreign key constraint"
-msgstr "在外键约束中指定了空引用字段"
-
-#: ../providers/mysql/gda-mysql-ddl.c:930
-msgid "Incorrect specified column name"
-msgstr "指定列的名称错误"
-
-#: ../providers/mysql/gda-mysql-handler-boolean.c:117
+#: ../providers/mysql/gda-mysql-handler-boolean.c:80
msgid "MySQL boolean representation"
msgstr "MySQL 布尔型表示"
-#: ../providers/mysql/gda-mysql-provider.c:477
+#: ../providers/mysql/gda-mysql-provider.c:450
msgid "Cannot give a UNIX SOCKET if you also provide either a HOST or a PORT"
-msgstr "如果您已经给出了主机或端口，就不能再给定 UNIX 套接字。"
+msgstr "如果您已经提供了主机或端口信息，就不能再给定 UNIX 套接字"
-#: ../providers/mysql/gda-mysql-provider.c:485
+#: ../providers/mysql/gda-mysql-provider.c:458
msgid "Invalid port number"
msgstr "无效的端口号"
-#: ../providers/mysql/gda-mysql-provider.c:520
+#: ../providers/mysql/gda-mysql-provider.c:496
#, c-format
msgid "Unknown MySQL protocol '%s'"
msgstr "未知的 MySQL 协议“%s”"
-#: ../providers/mysql/gda-mysql-provider.c:565
+#: ../providers/mysql/gda-mysql-provider.c:541
#, 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:611
+#: ../providers/mysql/gda-mysql-provider.c:587
msgid "The connection string must contain the DB_NAME values"
msgstr "连接字符串必须包含 DB_NAME 值"
-#: ../providers/mysql/gda-mysql-provider.c:646
-#: ../providers/mysql/gda-mysql-provider.c:700
+#: ../providers/mysql/gda-mysql-provider.c:624
+#: ../providers/mysql/gda-mysql-provider.c:678
#: ../providers/mysql/gda-mysql-util.c:65
msgid "No description"
msgstr "无描述"
-#: ../providers/mysql/gda-mysql-provider.c:1822
+#: ../providers/mysql/gda-mysql-provider.c:1767
msgid "Unnamed statement parameter is not allowed in prepared statement."
msgstr "准备就绪语句中不允许有未命名的语句参数。"
+#: ../providers/mysql/gda-mysql-provider.c:1988
+#: ../providers/postgres/gda-postgres-provider.c:1801
+#, c-format
+msgid "Can't execute SELECT statement to get last inserted row: %s"
+msgstr "无法执行 SELECT 语句以获取最新插入的行：%s"
+
#. force reading the complete BLOB into memory
-#: ../providers/mysql/gda-mysql-provider.c:2584
+#: ../providers/mysql/gda-mysql-provider.c:2518
msgid "Can't read whole BLOB into memory"
msgstr "无法整个读取 BLOB 到内存"
#. there is an error here
-#: ../providers/mysql/gda-mysql-provider.c:2631
-#, c-format
+#: ../providers/mysql/gda-mysql-provider.c:2565
+#, fuzzy, c-format
+#| msgid ""
+#| "Unhandled data type '%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."
+"Unhandled data type '%s', please report this bug to http://gitlab.gnome.org/";
+"GNOME/libgda/issues"
msgstr ""
"无法处理的数据类型“%s”，请在 http://bugzilla.gnome.org/ 上为“libgda”产品报告"
"这个 bug。"
-#: ../providers/mysql/gda-mysql-provider.c:2678
+#: ../providers/mysql/gda-mysql-provider.c:2611
msgid ""
"Could not use CURSOR. Mysql version 5.0 at least is required. Using random "
"access anyway."
msgstr ""
"无法使用 CURSOR。至少需要 Mysql 的 5.0 版本。无论如何都可以使用随机访问。"
-#: ../providers/mysql/gda-mysql-recordset.c:150
+#: ../providers/mysql/gda-mysql-recordset.c:152
msgid ""
"Could not use CURSOR. Mysql version 5.0 at least is required. Chunk size "
"ignored."
msgstr "无法使用 CURSOR。至少需要 Mysql 的 5.0 版本。已忽略块大小。"
-#: ../providers/mysql/gda-mysql-recordset.c:239
-#: ../providers/postgres/gda-postgres-recordset.c:149
+#: ../providers/mysql/gda-mysql-recordset.c:240
+#: ../providers/postgres/gda-postgres-recordset.c:147
msgid "Number of rows fetched at a time"
msgstr "一次获取的行数"
-#: ../providers/mysql/gda-mysql-recordset.c:247
+#: ../providers/mysql/gda-mysql-recordset.c:248
msgid "Number of row chunks read since the object creation"
msgstr "自从对象创建以来所读取的行块的数目"
-#: ../providers/mysql/gda-mysql-recordset.c:673
-#: ../providers/mysql/gda-mysql-recordset.c:984
-#: ../providers/mysql/gda-mysql-recordset.c:997
-#: ../providers/mysql/gda-mysql-recordset.c:1010
-#: ../providers/mysql/gda-mysql-recordset.c:1029
+#: ../providers/mysql/gda-mysql-recordset.c:695
+#: ../providers/mysql/gda-mysql-recordset.c:1039
+#: ../providers/mysql/gda-mysql-recordset.c:1052
+#: ../providers/mysql/gda-mysql-recordset.c:1065
+#: ../providers/mysql/gda-mysql-recordset.c:1084
#, c-format
msgid "Invalid column bind data type. %d\n"
msgstr "无效的列绑定数据类型。%d\n"
-#: ../providers/mysql/gda-mysql-recordset.c:827
+#: ../providers/mysql/gda-mysql-recordset.c:853
#, c-format
msgid "Type %s not mapped for value %d"
msgstr "没有为值 %2$d 映射类型 %1$s"
-#: ../providers/mysql/gda-mysql-recordset.c:846
+#: ../providers/mysql/gda-mysql-recordset.c:872
#, c-format
msgid "Type %s not mapped for value %lld"
msgstr "没有为值 %2$lld 映射类型 %1$s"
-#: ../providers/mysql/gda-mysql-recordset.c:895
+#: ../providers/mysql/gda-mysql-recordset.c:919
#, 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:912
-#: ../providers/mysql/gda-mysql-recordset.c:927
+#: ../providers/mysql/gda-mysql-recordset.c:936
+#: ../providers/mysql/gda-mysql-recordset.c:951
#, c-format
msgid "Type %s not mapped for value %f"
msgstr "没有为值 %2$f 映射类型 %1$s"
-#: ../providers/mysql/gda-mysql-recordset.c:1019
+#: ../providers/mysql/gda-mysql-recordset.c:1074
#, c-format
msgid "Type %s not mapped for value %s"
msgstr "没有为值 %2$s 映射类型 %1$s"
-#: ../providers/mysql/libmain.c:75
+#: ../providers/mysql/libmain.c:70
msgid "Provider for MySQL databases"
msgstr "MySQL 数据库的提供者"
@@ -5815,20 +6588,20 @@ 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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:15
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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:16
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:26
@@ -6072,33 +6845,33 @@ 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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:17
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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:18
msgid "TCP: TCP/IP connection to local or remote server."
msgstr "TCP：到本地或远程服务器的 TCP/IP 连接。"
#: ../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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:19
msgid ""
"Socket: Unix socket file connection to local server (Local Unix server only)."
msgstr "Socket：到本地服务器的 Unix socket 文件连接(仅限本地 Unix 服务器)。"
#: ../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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:20
msgid ""
"Pipe: Named-pipe connection to local or remote server (Windows server only)"
msgstr "管道：到本地或远程服务器的命名连接(仅限 Windows 服务器)"
#: ../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
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:21
msgid ""
"Memory: Shared-memory connection to local server (Local Windows server only)"
msgstr "内存：到本地服务器的共享内存连接(仅限本地 Windows 服务器)"
@@ -6127,69 +6900,6 @@ msgstr "对于类型为 CHAR 或 VARCHAR 的列，索引所在的字符数"
msgid "Table's comment"
msgstr "表注释"
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:37
-#: ../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:881
-msgid "Foreign key"
-msgstr "外键"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:39
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:43
-msgid "Referenced table"
-msgstr "引用的表"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:41
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:45
-msgid "Fields"
-msgstr "字段"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:43
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:47
-msgid "Fields in the foreign key"
-msgstr "外键中的字段"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:45
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:49
-msgid "Field"
-msgstr "字段"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:47
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:51
-msgid "Referenced field"
-msgstr "引用的字段"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:49
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:53
-msgid "Match type"
-msgstr "匹配类型"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:51
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:55
-msgid "Matching method if more than one field involved"
-msgstr "涉及多于一个字段时的匹配方法"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:53
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:57
-msgid "On update action"
-msgstr "在更新操作时"
-
-#. foreign key spec
-#: ../providers/mysql/mysql_specs_create_table.xml.in.h:55
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:59
-msgid "On delete action"
-msgstr "在删除操作时"
-
#. other table options
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:59
msgid "Table's options"
@@ -6289,7 +6999,7 @@ msgid "Index directory"
msgstr "索引目录"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:103
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:64
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:65
msgid "Match simple"
msgstr "简单匹配"
@@ -6298,28 +7008,28 @@ msgid "Match partial"
msgstr "部分匹配"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:105
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:65
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:66
msgid "Match full"
msgstr "匹配所有"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:106
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:66
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:67
msgid "No action"
msgstr "无操作"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:107
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:67
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:68
msgid "Restrict"
msgstr "限制"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:108
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:68
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:69
msgid "Cascade"
msgstr "级联"
#. To translators: Action of setting a value to NULL
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:110
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:70
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:71
msgid "Set to NULL"
msgstr "设置为 NULL"
@@ -6352,7 +7062,7 @@ msgid "Comma Separated Value (CSV)"
msgstr "逗号分隔的值(CSV)"
#: ../providers/mysql/mysql_specs_create_table.xml.in.h:118
-#: ../tools/cmdtool/tool-help.c:251 ../tools/cmdtool/tool-help.c:327
+#: ../tools/base/base-tool-help.c:221
msgid "Example"
msgstr "例子"
@@ -6464,6 +7174,18 @@ msgstr "压缩"
msgid "Use compression protocol"
msgstr "使用压缩协议"
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:13
+#, fuzzy
+#| msgid "InternalString"
+msgid "Interactive"
+msgstr "内部字符串"
+
+#: ../providers/mysql/mysql_specs_dsn.xml.in.h:14
+msgid ""
+" The client's session wait timeout set to the value of the session "
+"interactive_timeout variable."
+msgstr ""
+
#: ../providers/oracle/gda-oracle-meta.c:567
msgid "Could not fetch next row"
msgstr "无法取回下一行"
@@ -6494,117 +7216,125 @@ msgstr "无法获得属性"
msgid "NO DESCRIPTION"
msgstr "没有描述"
-#: ../providers/oracle/gda-oracle-util.c:626
+#: ../providers/oracle/gda-oracle-util.c:625
msgid "Invalid Oracle handle"
msgstr "无效的 Oracle 句柄"
-#: ../providers/oracle/gda-oracle-util.c:634
+#: ../providers/oracle/gda-oracle-util.c:633
msgid "Could not allocate Lob locator"
msgstr "无法指定 Lob 定位器"
-#: ../providers/oracle/gda-oracle-util.c:641
+#: ../providers/oracle/gda-oracle-util.c:640
msgid "Could not copy Lob locator"
msgstr "无法复制 Lob 定位器"
-#: ../providers/postgres/gda-postgres-handler-bin.c:119
-msgid "PostgresqlBin"
-msgstr "PostgresqlBin"
+#: ../providers/postgres/gda-postgres-ddl.c:927
+msgid "Dataholder type is unknown."
+msgstr ""
+
+#: ../providers/postgres/gda-postgres-ddl.c:1100
+msgid "Dataholder type is unknown. Report this as a bug."
+msgstr ""
+
+#: ../providers/postgres/gda-postgres-handler-bin.c:84
+msgid "PostgresqlBin"
+msgstr "PostgresqlBin"
-#: ../providers/postgres/gda-postgres-handler-bin.c:120
+#: ../providers/postgres/gda-postgres-handler-bin.c:85
msgid "PostgreSQL binary representation"
msgstr "PostgreSQL 二进制表示"
-#: ../providers/postgres/gda-postgres-handler-bin.c:204
+#: ../providers/postgres/gda-postgres-handler-bin.c:166
msgid "Insufficient memory to convert binary buffer to string"
msgstr "没有足够的内存来执行二进制缓存到字符串的转换"
-#: ../providers/postgres/gda-postgres-handler-bin.c:244
+#: ../providers/postgres/gda-postgres-handler-bin.c:206
msgid "Insufficient memory to convert string to binary buffer"
msgstr "没有足够的内存来执行字符串到二进制缓存的转换"
-#: ../providers/postgres/gda-postgres-provider.c:503
+#: ../providers/postgres/gda-postgres-provider.c:483
msgid "Could not determine the default date format"
msgstr "无法确定默认日期格式"
-#: ../providers/postgres/gda-postgres-provider.c:550
+#: ../providers/postgres/gda-postgres-provider.c:530
msgid "The connection string must contain a DB_NAME value"
msgstr "连接字符串必须包含 DB_NAME 值"
-#: ../providers/postgres/gda-postgres-provider.c:554
+#: ../providers/postgres/gda-postgres-provider.c:534
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:703
+#: ../providers/postgres/gda-postgres-provider.c:683
#, c-format
msgid "Could not set search_path to %s"
msgstr "无法设置 search_path 到 %s"
-#: ../providers/postgres/gda-postgres-provider.c:711
+#: ../providers/postgres/gda-postgres-provider.c:691
#, c-format
msgid "Search path %s is invalid"
msgstr "搜索路径 %s 无效"
-#: ../providers/postgres/gda-postgres-provider.c:1142
-#: ../providers/postgres/gda-postgres-provider.c:1144
+#: ../providers/postgres/gda-postgres-provider.c:1095
+#: ../providers/postgres/gda-postgres-provider.c:1097
msgid "Transactions are not supported in read uncommitted isolation level"
msgstr "在 读未提交隔离(read uncommitted isolation)级别不支持事务"
-#: ../providers/postgres/gda-postgres-provider.c:1148
-#: ../providers/postgres/gda-postgres-provider.c:1150
+#: ../providers/postgres/gda-postgres-provider.c:1101
+#: ../providers/postgres/gda-postgres-provider.c:1103
msgid "Transactions are not supported in repeatable read isolation level"
msgstr "在 可重复读隔离(repeatable read isolation) 级别不支持事务"
-#: ../providers/postgres/gda-postgres-provider.c:1167
-#: ../providers/postgres/gda-postgres-provider.c:1265
-#: ../providers/postgres/gda-postgres-provider.c:1315
-#: ../providers/postgres/gda-postgres-provider.c:1365
-#: ../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:694
+#: ../providers/postgres/gda-postgres-provider.c:1120
+#: ../providers/postgres/gda-postgres-provider.c:1220
+#: ../providers/postgres/gda-postgres-provider.c:1270
+#: ../providers/postgres/gda-postgres-provider.c:1320
+#: ../providers/postgres/gda-postgres-recordset.c:424
+#: ../providers/postgres/gda-postgres-recordset.c:453
+#: ../providers/postgres/gda-postgres-recordset.c:617
+#: ../providers/postgres/gda-postgres-recordset.c:679
msgid "Internal error"
msgstr "内部错误"
-#: ../providers/postgres/gda-postgres-provider.c:1271
-#: ../providers/postgres/gda-postgres-provider.c:1321
-#: ../providers/postgres/gda-postgres-provider.c:1371
+#: ../providers/postgres/gda-postgres-provider.c:1226
+#: ../providers/postgres/gda-postgres-provider.c:1276
+#: ../providers/postgres/gda-postgres-provider.c:1326
#, c-format
msgid "Wrong savepoint name '%s'"
msgstr "错误的保存点 (savepoint) 名称 '%s'"
-#: ../providers/postgres/gda-postgres-provider.c:2217
-#: ../providers/postgres/gda-postgres-provider.c:2219
+#: ../providers/postgres/gda-postgres-provider.c:2169
+#: ../providers/postgres/gda-postgres-provider.c:2171
msgid "Cannot start transaction"
msgstr "无法启动事务"
-#: ../providers/postgres/gda-postgres-provider.c:2478
-#: ../providers/postgres/gda-postgres-provider.c:2514
-#: ../providers/postgres/gda-postgres-provider.c:2549
+#: ../providers/postgres/gda-postgres-provider.c:2424
+#: ../providers/postgres/gda-postgres-provider.c:2461
+#: ../providers/postgres/gda-postgres-provider.c:2497
msgid "Could not set the XA transaction ID parameter"
msgstr "无法设置 XA 事务 ID 参数"
-#: ../providers/postgres/gda-postgres-recordset.c:154
+#: ../providers/postgres/gda-postgres-recordset.c:152
msgid "Number of rows chunks read since the object creation"
msgstr "自从对象创建以来所读取的行块的数目"
-#: ../providers/postgres/gda-postgres-recordset.c:624
+#: ../providers/postgres/gda-postgres-recordset.c:611
#, c-format
msgid "Invalid date format '%s'"
msgstr "无效的日期格式“%s”"
-#: ../providers/postgres/gda-postgres-recordset.c:688
+#: ../providers/postgres/gda-postgres-recordset.c:673
#, c-format
msgid "Invalid timestamp value '%s'"
msgstr "无效的时间戳值“%s”"
-#: ../providers/postgres/gda-postgres-recordset.c:766
+#: ../providers/postgres/gda-postgres-recordset.c:749
#, c-format
msgid "Invalid binary string representation '%s ...'"
msgstr "无效的二进制字符串表示“%s ...”"
-#: ../providers/postgres/libmain.c:82
+#: ../providers/postgres/libmain.c:69
msgid "Provider for PostgreSQL databases"
msgstr "PostgreSQL 数据库的提供者"
@@ -6616,6 +7346,24 @@ msgstr "忽略后代(descendants)"
msgid "Don't add the column to descendants of the table"
msgstr "不要将列添加到表的后代(descendants)中"
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:6
+#, fuzzy
+#| msgid "Only if existing"
+msgid "Only if it exist"
+msgstr "只有存在时"
+
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:7
+#, fuzzy
+#| msgid "Drop role only if it exists"
+msgid "Add column only if it exist"
+msgstr "只在角色存在时丢弃(drop)它"
+
+#: ../providers/postgres/postgres_specs_add_column.xml.in.h:11
+#, fuzzy
+#| msgid "Only if it does not yet exist"
+msgid "Add column only if it does not yet exist"
+msgstr "只在尚未存在时"
+
#. Connection parameters
#: ../providers/postgres/postgres_specs_create_db.xml.in.h:5
#: ../providers/postgres/postgres_specs_drop_db.xml.in.h:5
@@ -6650,7 +7398,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:588
+#: ../tools/common/t-app.c:1762
msgid "Owner"
msgstr "属主"
@@ -6853,6 +7601,13 @@ msgstr "谓语(Predicate)"
msgid "Constraint expression for a partial index"
msgstr "部分索引的约束表达式"
+#. Index fields
+#: ../providers/postgres/postgres_specs_create_index.xml.in.h:19
+#, fuzzy
+#| msgid "Collation"
+msgid "Collation name"
+msgstr "排序规则"
+
#.
#. This file contains the CREATE ROLE operation's parameters, which is
#. available since PostgreSQL 8.1
@@ -7068,57 +7823,53 @@ msgstr ""
"列出一个或多个将自动添加为新角色成员的现有角色，并给予它们在此角色中任命其他"
"成员的权利"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:5
-msgid "With OIDs"
-msgstr "带有 OIDs"
-
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:7
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:8
msgid "Parent table(s)"
msgstr "父表"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:8
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:9
msgid "Inheritance"
msgstr "继承"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:9
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:10
msgid "Parent table"
msgstr "父表"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:10
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:11
msgid "Keep coupled"
msgstr "保持成对(coupled)"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:11
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:12
msgid "Use INHERIT instead of LIKE"
msgstr "使用 INHERIT 替代 LIKE"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:12
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:13
msgid "Copy defaults"
msgstr "复制默认"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:13
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:14
msgid "Copy default expressions"
msgstr "复制默认表达式"
#. foreign key spec
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:61
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:62
msgid "Deferrable"
msgstr "可延期"
#. To translators: Action of setting a value to its default value
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:72
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:73
msgid "Set to default"
msgstr "设为默认"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:73
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:74
msgid "Not deferrable"
msgstr "不可延期"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:74
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:75
msgid "Deferrable initially immediate"
msgstr "可延期，开始时为立即的"
-#: ../providers/postgres/postgres_specs_create_table.xml.in.h:75
+#: ../providers/postgres/postgres_specs_create_table.xml.in.h:76
msgid "Deferrable initially deferred"
msgstr "可延期，开始时为延期的"
@@ -7171,7 +7922,9 @@ msgid "Existing user"
msgstr "现有的用户"
#: ../providers/postgres/postgres_specs_create_view.xml.in.h:4
-msgid "Replace it already exists"
+#, fuzzy
+#| msgid "Replace it already exists"
+msgid "Replace if already exists"
msgstr "替换已经存在的"
#: ../providers/postgres/postgres_specs_drop_column.xml.in.h:6
@@ -7228,37 +7981,52 @@ 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 ""
-"最长的连接等待时间。0 或不指定表示无限期等待。不建议使用短于 2 秒的超时。"
-
-#: ../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
+"最长的连接等待时间。0 或不指定表示无限期等待。不建议使用短于 2 秒的超时"
+
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:793
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:856
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1064
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1133
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1207
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1516
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1593
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1636
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1716
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1818
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1857
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1909
+#: ../providers/reuseable/mysql/gda-mysql-meta.c:1948
msgid "Mysql version 5.0 at least is required"
msgstr "至少需要 Mysql 5.0 版"
-#: ../providers/reuseable/mysql/gda-mysql-reuseable.c:174
-#: ../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:310
+#: ../providers/reuseable/mysql/gda-mysql-reuseable.c:177
+#: ../providers/reuseable/mysql/gda-mysql-reuseable.c:219
+#: ../providers/web/gda-web-meta.c:105 ../providers/web/gda-web-recordset.c:283
msgid "Can't import data from web server"
msgstr "无法从网页服务器导入数据"
-#: ../providers/reuseable/postgres/gda-postgres-meta.c:2122
+#: ../providers/reuseable/postgres/gda-postgres-meta.c:2313
msgid "could not determine the indexed columns for index"
msgstr "无法为索引决定索引列"
-#: ../providers/sqlcipher/libmain.c:76
+#: ../providers/reuseable/postgres/gda-postgres-reuseable.c:193
+#, fuzzy, c-format
+#| msgid "Can't import data from web server"
+msgid "Can't get version data from server: %s"
+msgstr "无法从网页服务器导入数据"
+
+#: ../providers/reuseable/postgres/gda-postgres-reuseable.c:317
+#, c-format
+msgid "Internal Error: Can't calculate PostgreSQL version: %s"
+msgstr ""
+
+#: ../providers/sqlcipher/gda-sqlcipher-provider.c:47
+#, fuzzy
+#| msgid "Can't find libsqlite3."
+msgid "Can't find sqlcipher."
+msgstr "无法找到 libsqlite3。"
+
+#: ../providers/sqlcipher/libmain.c:70
msgid "Provider for SQLCipher"
msgstr "SQLCipher 的提供者"
@@ -7274,71 +8042,79 @@ msgstr "口令"
msgid "Encryption passphrase"
msgstr "加密口令"
-#: ../providers/sqlite/libmain.c:75
+#: ../providers/sqlite/libmain.c:70
msgid "Provider for SQLite databases"
msgstr "SQLite 数据库的提供者"
-#: ../providers/web/gda-web-provider.c:309 ../providers/web/gda-web-util.c:293
-#: ../providers/web/gda-web-util.c:411 ../providers/web/gda-web-util.c:564
+#: ../providers/web/gda-web-provider.c:269 ../providers/web/gda-web-util.c:219
+#: ../providers/web/gda-web-util.c:337 ../providers/web/gda-web-util.c:481
#, c-format
msgid "Invalid HOST/SCRIPT '%s'"
msgstr "无效的 HOST/SCRIPT '%s'"
-#: ../providers/web/gda-web-provider.c:363
-#: ../providers/web/gda-web-provider.c:369
-#: ../providers/web/gda-web-provider.c:375
-#: ../providers/web/gda-web-provider.c:383
+#: ../providers/web/gda-web-provider.c:323
+#: ../providers/web/gda-web-provider.c:329
+#: ../providers/web/gda-web-provider.c:335
+#: ../providers/web/gda-web-provider.c:343
#, c-format
msgid "The connection string must contain the %s value"
msgstr "连接字符串必须包含 %s 值"
-#: ../providers/web/gda-web-provider.c:649
-#: ../providers/web/gda-web-provider.c:678
+#: ../providers/web/gda-web-provider.c:601
+#: ../providers/web/gda-web-provider.c:630
msgid "Server operations not yet implemented"
msgstr "服务器操作尚未实现"
-#: ../providers/web/gda-web-provider.c:720
-#: ../providers/web/gda-web-provider.c:785
-#: ../providers/web/gda-web-provider.c:845
+#: ../providers/web/gda-web-provider.c:672
+#: ../providers/web/gda-web-provider.c:737
+#: ../providers/web/gda-web-provider.c:797
msgid "Named transaction is not supported"
msgstr "不支持命名事务"
-#: ../providers/web/gda-web-provider.c:725
+#: ../providers/web/gda-web-provider.c:677
msgid "Transaction level is not supported"
msgstr "不支持事务级别"
-#: ../providers/web/gda-web-provider.c:905
-#: ../providers/web/gda-web-provider.c:966
+#: ../providers/web/gda-web-provider.c:857
+#: ../providers/web/gda-web-provider.c:918
msgid "Unnamed savepoint is not supported"
msgstr "不支持未命名的保存点(savepoint)"
-#: ../providers/web/gda-web-util.c:148 ../providers/web/gda-web-util.c:162
-msgid "Could not parse server's reponse"
+#: ../providers/web/gda-web-util.c:74
+#, fuzzy
+#| msgid "Could not parse server's reponse"
+msgid "Could not parse server's response"
msgstr "无法解析服务器反应"
-#: ../providers/web/gda-web-util.c:156
+#: ../providers/web/gda-web-util.c:82
msgid "Invalid response hash"
msgstr "无效的响应散列"
-#: ../providers/web/gda-web-util.c:344
+#: ../providers/web/gda-web-util.c:88
+msgid "Could not parse server's reponse"
+msgstr "无法解析服务器反应"
+
+#: ../providers/web/gda-web-util.c:270
msgid "Can't start new thread"
msgstr "无法启动新线程"
-#: ../providers/web/gda-web-util.c:398 ../providers/web/gda-web-util.c:438
+#: ../providers/web/gda-web-util.c:324 ../providers/web/gda-web-util.c:364
msgid "Could not run PHP script on the server"
msgstr "无法在服务器上运行 PHP 脚本"
-#: ../providers/web/gda-web-util.c:425
+#: ../providers/web/gda-web-util.c:351
msgid "The transaction has been automatically rolled back"
msgstr "事务已经自动回滚"
-#: ../providers/web/gda-web-util.c:575
+#: ../providers/web/gda-web-util.c:492
#, c-format
msgid "Error cleaning data on the server for session %s"
msgstr "在服务器上为会话 %s 清理数据出错"
-#: ../providers/web/gda-web-util.c:607
-msgid "Non detailled error"
+#: ../providers/web/gda-web-util.c:524
+#, fuzzy
+#| msgid "Non detailled error"
+msgid "Non detailed error"
msgstr "无更详细的错误"
#: ../providers/web/libmain.c:75
@@ -7378,428 +8154,303 @@ msgstr "服务器机密"
msgid "The name of a database to use"
msgstr "要使用的数据库名"
-#: ../testing/gda-test-blob.c:98 ../testing/gda-test-connection.c:85
+#: ../testing/gda-test-blob.c:99 ../testing/gda-test-connection.c:93
#, c-format
msgid "DSN '%s' is not declared"
msgstr "DSN '%s' 未声明"
-#: ../testing/gda-test-blob.c:103 ../testing/gda-test-connection.c:90
+#: ../testing/gda-test-blob.c:104 ../testing/gda-test-connection.c:98
#, c-format
msgid "Can't open connection to DSN %s: %s\n"
msgstr "无法打开到 DSN %s 的连接：%s\n"
-#: ../testing/gda-test-blob.c:114 ../testing/gda-test-connection.c:100
+#: ../testing/gda-test-blob.c:115 ../testing/gda-test-connection.c:108
#, c-format
msgid "Can't open specified connection: %s\n"
msgstr "无法打开指定连接：%s\n"
-#: ../testing/gda-test-blob.c:121 ../testing/gda-test-connection.c:107
+#: ../testing/gda-test-blob.c:122 ../testing/gda-test-connection.c:115
#, c-format
msgid "Connection successfully opened!\n"
msgstr "连接成功打开！\n"
-#: ../testing/gda-test-connection.c:109
+#: ../testing/gda-test-connection.c:117
#, c-format
-#| msgid "Can't open connection %d: %s\n"
msgid "Can't close connection: %s\n"
msgstr "无法关闭连接：%s\n"
-#: ../tools/browser/auth-dialog.c:535
-msgid "For connection"
-msgstr "要连接"
-
-#: ../tools/browser/auth-dialog.c:536
-msgid "enter authentication information"
-msgstr "输入认证信息"
+#: ../tools/base/base-tool-command.c:139 ../tools/base/base-tool-command.c:156
+msgid "Invalid unnamed command"
+msgstr "无效的未命名命令"
-#: ../tools/browser/auth-dialog.c:677 ../tools/browser/login-dialog.c:234
+#: ../tools/base/base-tool-command.c:279
#, c-format
-msgid ""
-"Could not open connection:\n"
-"%s"
-msgstr ""
-"无法打开连接：\n"
-"%s"
+msgid "Command '%s' not found"
+msgstr "没有找到命令“%s”"
-#: ../tools/browser/browser-connection.c:175
+#: ../tools/base/base-tool-command.c:320
#, c-format
-msgid "c%u"
-msgstr "c%u"
-
-#: ../tools/browser/browser-connection.c:212
-msgid "Analysing database schema"
-msgstr "正在分析数据库方案"
+msgid "Syntax error after '\\'"
+msgstr "“\\”之后有语法错误"
-#: ../tools/browser/browser-connection.c:238
-#: ../tools/browser/browser-connection.c:358
-#: ../tools/browser/browser-connection.c:650
+#: ../tools/base/base-tool-command.c:354
#, c-format
-msgid "Error while fetching meta data from the connection: %s"
-msgstr "从连接中获取元数据出错：%s"
-
-#: ../tools/browser/browser-connection.c:540
-#: ../tools/browser/browser-window.c:280
-msgid "Connection"
-msgstr "连接"
+msgid "Unbalanced usage of quotes"
+msgstr "左右引号不匹配"
-#: ../tools/browser/browser-connection.c:542
-msgid "unnamed"
-msgstr "未命名的"
+#: ../tools/base/base-tool-help.c:219
+msgid "Usage"
+msgstr "用法"
-#: ../tools/browser/browser-connection.c:545
-msgid "data source"
-msgstr "数据源"
+#: ../tools/base/base-tool-input.c:500
+#, c-format
+msgid "Could not save history file to '%s': %s"
+msgstr "无法保存历史文件到 '%s'：%s"
-#: ../tools/browser/browser-connection.c:640
-msgid "Getting database schema information"
-msgstr "正在获取数据库方案信息"
+#: ../tools/base/base-tool-output.c:92 ../tools/base/base-tool-output.c:498
+#: ../tools/base/base-tool-output.c:580
+#: ../tools/browser/query-exec/query-result.c:240
+#: ../tools/browser/query-exec/query-result.c:268
+#: ../tools/browser/query-exec/query-result.c:433
+#, c-format
+msgid "Execution delay"
+msgstr "执行延迟"
-#: ../tools/browser/browser-connection.c:975
-msgid "Connection not yet opened"
-msgstr "连接尚未打开"
+#: ../tools/base/base-tool-output.c:165
+#, c-format
+msgid "(%d row)"
+msgid_plural "(%d rows)"
+msgstr[0] "(%d 行)"
-#: ../tools/browser/browser-connection.c:981
-msgid "Can't initialize dictionary to store table preferences"
-msgstr "无法初始化保存表首选项的字典"
+#: ../tools/base/base-tool-output.c:491 ../tools/base/base-tool-output.c:573
+#: ../tools/browser/query-exec/query-result.c:260
+#: ../tools/browser/query-exec/query-result.c:426
+msgid "Number of rows impacted"
+msgstr "影响的行数"
-#: ../tools/browser/browser-connection.c:1027
-#: ../tools/browser/browser-connection.c:1033
-#: ../tools/browser/browser-connection.c:1169 ../tools/tools-favorites.c:628
-#: ../tools/tools-favorites.c:634 ../tools/tools-favorites.c:1061
-#: ../tools/tools-favorites.c:1068
-msgid "Can't initialize transaction to access favorites"
-msgstr "无法初始化用以访问收藏的事务"
+#: ../tools/browser/auth-dialog.c:485
+msgid "For connection"
+msgstr "要连接"
-#: ../tools/browser/browser-connection.c:1114 ../tools/tools-favorites.c:807
-#: ../tools/tools-favorites.c:1136
-msgid "Can't commit transaction to access favorites"
-msgstr "无法提交事务以访问收藏"
+#: ../tools/browser/auth-dialog.c:486
+msgid "enter authentication information"
+msgstr "输入认证信息"
-#: ../tools/browser/browser-connection.c:1673
-msgid "Could not execute LDAP search"
-msgstr "无法执行 LDAP 搜索"
+#: ../tools/browser/auth-dialog.c:619 ../tools/browser/login-dialog.c:229
+#, c-format
+msgid ""
+"Could not open connection:\n"
+"%s"
+msgstr ""
+"无法打开连接：\n"
+"%s"
-#: ../tools/browser/browser-connections-list.c:157
+#: ../tools/browser/browser-connections-list.c:155
#, c-format
msgid "DSN: %s"
msgstr "DSN：%s"
-#: ../tools/browser/browser-connections-list.c:159
+#: ../tools/browser/browser-connections-list.c:157
#, c-format
msgid "Provider: %s"
msgstr "提供者：%s"
-#: ../tools/browser/browser-connections-list.c:205
+#: ../tools/browser/browser-connections-list.c:203
+#: ../tools/common/t-connection.c:2456
msgid "Database provider"
msgstr "数据库提供者"
-#: ../tools/browser/browser-connections-list.c:212
+#: ../tools/browser/browser-connections-list.c:210
msgid "In memory"
msgstr "内存中"
-#: ../tools/browser/browser-connections-list.c:214
+#: ../tools/browser/browser-connections-list.c:212
msgid "Dictionary file"
msgstr "辞典文件"
-#: ../tools/browser/browser-connections-list.c:215
+#: ../tools/browser/browser-connections-list.c:213
msgid ""
"File used to store any information associated\n"
"to this connection (favorites, descriptions, ...)"
msgstr "用于保存与此连接关联的任何信息(收藏、描述、...)的文件"
-#: ../tools/browser/browser-connections-list.c:328
+#: ../tools/browser/browser-connections-list.c:316
msgid "Opened connections"
msgstr "打开的连接"
-#: ../tools/browser/browser-connections-list.c:356 ../tools/gda-sql.c:2981
+#: ../tools/browser/browser-connections-list.c:343 ../tools/common/t-app.c:2905
msgid "List of opened connections"
msgstr "列出打开的连接"
-#: ../tools/browser/browser-connections-list.c:365 ../tools/web-server.c:714
+#: ../tools/browser/browser-connections-list.c:352
+#: ../tools/common/web-server.c:646
msgid "Connections"
msgstr "连接"
-#: ../tools/browser/browser-connections-list.c:381
+#: ../tools/browser/browser-connections-list.c:368
msgid "Connection's properties"
msgstr "连接的属性"
-#: ../tools/browser/browser-connections-list.c:392
+#: ../tools/browser/browser-connections-list.c:379
+#: ../tools/browser/browser-window.c:329
msgid "Close connection"
msgstr "关闭连接"
-#: ../tools/browser/browser-connections-list.c:396
+#: ../tools/browser/browser-connections-list.c:383
msgid "Close selected connection"
msgstr "关闭选中的连接"
-#: ../tools/browser/browser-connections-list.c:399
+#: ../tools/browser/browser-connections-list.c:386
msgid "Connect"
msgstr "连接"
-#: ../tools/browser/browser-connections-list.c:403
+#: ../tools/browser/browser-connections-list.c:390
msgid "Open a new connection"
msgstr "打开新连接"
-#: ../tools/browser/browser-stock-icons.c:44
-msgid "History"
-msgstr "历史"
-
-#: ../tools/browser/browser-stock-icons.c:45
-msgid "Bookmarks"
-msgstr "书签"
-
-#: ../tools/browser/browser-stock-icons.c:46
-#: ../tools/browser/browser-window.c:302
-msgid "Begin"
-msgstr "开始"
-
-#: ../tools/browser/browser-stock-icons.c:47
-#: ../tools/browser/browser-window.c:304
-msgid "Commit"
-msgstr "提交"
-
-#: ../tools/browser/browser-stock-icons.c:48
-#: ../tools/browser/browser-window.c:306
-msgid "Rollback"
-msgstr "回滚"
-
-#: ../tools/browser/browser-stock-icons.c:49
-msgid "Builder"
-msgstr "生成器"
+#: ../tools/browser/browser-window.c:268 ../tools/browser/browser-window.c:447
+#: ../tools/browser/ldap-browser/perspective-main.c:35
+#: ../tools/browser/schema-browser/table-columns.c:985
+#: ../tools/browser/ui-formgrid.c:740
+msgid "LDAP browser"
+msgstr "LDAP 浏览器"
-#: ../tools/browser/browser-stock-icons.c:50
-msgid "Ldap entries"
-msgstr "Ldap 记录"
+#: ../tools/browser/browser-window.c:319
+#, fuzzy
+#| msgid "_Fetch Meta Data"
+msgid "Fetch Meta Data"
+msgstr "获取元数据(_F)"
-#: ../tools/browser/browser-stock-icons.c:51
-msgid "Add table"
-msgstr "添加表"
+#: ../tools/browser/browser-window.c:322
+msgid "Connection properties"
+msgstr "连接属性"
-#: ../tools/browser/browser-stock-icons.c:52
-msgid "Grid"
-msgstr "网格"
+#: ../tools/browser/browser-window.c:336
+#, fuzzy
+#| msgid "Display popup as list"
+msgid "Display options"
+msgstr "以列表显示弹出项目"
-#: ../tools/browser/browser-stock-icons.c:53
-msgid "Form"
-msgstr "表单"
+#: ../tools/browser/browser-window.c:351
+#, fuzzy
+#| msgid "Rollback current transaction"
+msgid "Rollback transaction"
+msgstr "回滚当前事务"
-#: ../tools/browser/browser-virtual-connection.c:91
-msgid "Bound connection is used"
-msgstr "绑定连接已使用"
+#: ../tools/browser/browser-window.c:358
+#, fuzzy
+#| msgid "Commit current transaction"
+msgid "Commit transaction"
+msgstr "提交当前事务"
-#: ../tools/browser/browser-virtual-connection.c:115
-msgid "Virtual connection using this connection is busy"
-msgstr "使用此连接的虚拟连接正忙"
+#: ../tools/browser/browser-window.c:365
+#, fuzzy
+#| msgid "Begin a new transaction"
+msgid "Begin transaction"
+msgstr "开始一个新事务"
-#: ../tools/browser/browser-window.c:276
-msgid "_Fullscreen"
+#: ../tools/browser/browser-window.c:411
+#, fuzzy
+#| msgid "_Fullscreen"
+msgid "Fullscreen"
msgstr "全屏(_F)"
-#: ../tools/browser/browser-window.c:276
-msgid "Use the whole screen"
-msgstr "使用整个屏幕"
-
-#: ../tools/browser/browser-window.c:280
-msgid "_Connection"
-msgstr "连接(_C)"
-
-#: ../tools/browser/browser-window.c:281
-msgid "_Connect"
-msgstr "连接(_C)"
-
-#: ../tools/browser/browser-window.c:281
-msgid "Open a connection"
+#: ../tools/browser/browser-window.c:414
+#, fuzzy
+#| msgid "Open a connection"
+msgid "Open Connection"
msgstr "打开连接"
-#: ../tools/browser/browser-window.c:282
-msgid "_Bind Connection"
+#: ../tools/browser/browser-window.c:417
+#, fuzzy
+#| msgid "_Bind Connection"
+msgid "Bind Connections"
msgstr "绑定连接(_B)"
-#: ../tools/browser/browser-window.c:282
-msgid ""
-"Use connection to create\n"
-"a new binding connection to access data\n"
-"from multiple databases at once"
-msgstr ""
-"通过连接创建\n"
-"一个新的绑定连接来一次访问\n"
-"来自多个数据库的数据"
-
-#: ../tools/browser/browser-window.c:285
-msgid "Connection properties"
-msgstr "连接属性"
-
-#: ../tools/browser/browser-window.c:286
-msgid "_Connections List"
+#: ../tools/browser/browser-window.c:420
+#, fuzzy
+#| msgid "_Connections List"
+msgid "Connections List"
msgstr "连接列表(_C)"
-#: ../tools/browser/browser-window.c:286
-msgid "Connections list"
-msgstr "连接列表"
-
-#: ../tools/browser/browser-window.c:287
-msgid "_Fetch Meta Data"
-msgstr "获取元数据(_F)"
-
-#: ../tools/browser/browser-window.c:287
-msgid "Fetch meta data"
-msgstr "获取元数据"
-
-#: ../tools/browser/browser-window.c:288
-msgid "_Close Connection"
-msgstr "关闭连接(_C)"
-
-#: ../tools/browser/browser-window.c:288
-msgid "Close this connection"
-msgstr "关闭此连接"
-
-#: ../tools/browser/browser-window.c:289
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../tools/browser/browser-window.c:289 ../tools/gda-sql.c:2194
-msgid "Quit"
-msgstr "退出"
-
-#: ../tools/browser/browser-window.c:290
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../tools/browser/browser-window.c:290
-msgid "Edit"
-msgstr "编辑"
-
-#: ../tools/browser/browser-window.c:291
-msgid "_Display"
-msgstr "显示(_D)"
-
-#: ../tools/browser/browser-window.c:291
-msgid "Display"
-msgstr "显示"
-
-#: ../tools/browser/browser-window.c:292
-msgid "_Perspective"
-msgstr "透视(_P)"
-
-#: ../tools/browser/browser-window.c:292
-msgid "Perspective"
-msgstr "透视"
-
-#: ../tools/browser/browser-window.c:293
-msgid "_Window"
-msgstr "窗口(_W)"
-
-#: ../tools/browser/browser-window.c:293
-msgid "Window"
-msgstr "窗口"
-
-#: ../tools/browser/browser-window.c:294
-msgid "_New Window"
+#: ../tools/browser/browser-window.c:423
+#, fuzzy
+#| msgid "_New Window"
+msgid "New Window"
msgstr "新窗口(_N)"
-#: ../tools/browser/browser-window.c:294
-msgid "Open a new window for current connection"
-msgstr "为当前连接打开一个新窗口"
-
-#: ../tools/browser/browser-window.c:295
-msgid "New Window for _Connection"
-msgstr "为连接新建窗口(_C)"
-
-#: ../tools/browser/browser-window.c:295
-msgid "Open a new window for a connection"
-msgstr "为某个连接打开一个新窗口"
-
-#: ../tools/browser/browser-window.c:297
-msgid "_Help"
-msgstr "帮助(_H)"
+#: ../tools/browser/browser-window.c:426
+msgid "About"
+msgstr "关于"
-#: ../tools/browser/browser-window.c:297
-#: ../tools/browser/data-manager/data-console.c:420
+#: ../tools/browser/browser-window.c:430
+#: ../tools/browser/data-manager/data-console.c:418
+#: ../tools/browser/schema-browser/table-info.c:925
msgid "Help"
msgstr "帮助"
-#: ../tools/browser/browser-window.c:300
-msgid "_Manual"
-msgstr "手工(_M)"
-
-#: ../tools/browser/browser-window.c:300
-msgid "Manual"
-msgstr "手工"
-
-#: ../tools/browser/browser-window.c:302
-msgid "Begin a new transaction"
-msgstr "开始一个新事务"
-
-#: ../tools/browser/browser-window.c:304
-msgid "Commit current transaction"
-msgstr "提交当前事务"
+#: ../tools/browser/browser-window.c:434 ../tools/common/t-app.c:1136
+msgid "Quit"
+msgstr "退出"
-#: ../tools/browser/browser-window.c:306
-msgid "Rollback current transaction"
-msgstr "回滚当前事务"
+#: ../tools/browser/browser-window.c:438
+#, fuzzy
+#| msgid "Perspective"
+msgid "Perspectives"
+msgstr "透视"
-#: ../tools/browser/browser-window.c:516 ../tools/browser/browser-window.c:571
-#: ../tools/browser/common/ui-formgrid.c:776
-#: ../tools/browser/ldap-browser/perspective-main.c:33
-#: ../tools/browser/schema-browser/table-columns.c:975
-msgid "LDAP browser"
-msgstr "LDAP 浏览器"
+#: ../tools/browser/browser-window.c:513
+#, fuzzy
+#| msgid "Hit the Escape key to leave the fullscreen mode"
+msgid "Hit the F11 key to leave the fullscreen mode"
+msgstr "按 Escape 键退出全屏模式"
-#: ../tools/browser/browser-window.c:818 ../tools/browser/support.c:82
+#: ../tools/browser/browser-window.c:570
#, c-format
msgid "Do you want to close the '%s' connection?"
msgstr "想要关闭 '%s' 连接吗？"
-#: ../tools/browser/browser-window.c:860 ../tools/browser/browser-window.c:867
-msgid "Do you want to quit the application?"
-msgstr "要退出程序吗？"
-
-#: ../tools/browser/browser-window.c:861
-msgid "all the connections will be closed."
-msgstr "所有的连接都将被关闭"
-
-#: ../tools/browser/browser-window.c:868
-msgid "the connection will be closed."
-msgstr "连接将被关闭"
-
-#: ../tools/browser/browser-window.c:919
+#: ../tools/browser/browser-window.c:617
#, c-format
msgid "Error starting transaction: %s"
msgstr "启动事务出错：%s"
-#: ../tools/browser/browser-window.c:933
+#: ../tools/browser/browser-window.c:632
#, c-format
msgid "Error committing transaction: %s"
msgstr "提交事务出错：%s"
-#: ../tools/browser/browser-window.c:947
+#: ../tools/browser/browser-window.c:647
#, c-format
msgid "Error rolling back transaction: %s"
msgstr "回滚事务出错：%s"
-#: ../tools/browser/browser-window.c:1027
-msgid "Hit the Escape key to leave the fullscreen mode"
-msgstr "按 Escape 键退出全屏模式"
-
-#: ../tools/browser/browser-window.c:1172
+#: ../tools/browser/browser-window.c:698
#, c-format
msgid "Error updating bound connection: %s"
msgstr "更新绑定连接出错：%s"
-#: ../tools/browser/browser-window.c:1213
-#, c-format
-msgid "Could not open binding connection: %s"
-msgstr "无法打开绑定的连接：%s"
+#: ../tools/browser/browser-window.c:707
+#, fuzzy, c-format
+#| msgid "Error updating bound connection: %s"
+msgid "Error updating meta data for connection: %s"
+msgstr "更新绑定连接出错：%s"
-#: ../tools/browser/browser-window.c:1253
-#: ../tools/browser/gda-browser-6.0.desktop.in.h:1
-msgid "Database browser"
-msgstr "数据库浏览器"
+#: ../tools/browser/browser-window.c:730
+#, fuzzy, c-format
+#| msgid "Error creating database: %s"
+msgid "Error Updating Meta Data: %s"
+msgstr "创建数据库错误：%s"
-#: ../tools/browser/browser-window.c:1589
+#: ../tools/browser/browser-window.c:1048
msgid "Don't show this message again"
msgstr "不要再次显示此信息"
-#: ../tools/browser/browser-window.c:1736
+#: ../tools/browser/browser-window.c:1057 ../tools/browser/ui-formgrid.c:658
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: ../tools/browser/browser-window.c:1165
#, c-format
msgid ""
"The current perspective has changed to the '%s' perspective, you can switch "
@@ -7809,35 +8460,59 @@ msgstr ""
"当前透视已更改为“%s”透视，您可以通过“透视/%s”菜单改回上个透视，或使用“%s”快捷"
"键"
-#: ../tools/browser/canvas/browser-canvas.c:353
+#: ../tools/browser/canvas/browser-canvas.c:339
+msgid "Zoom in"
+msgstr ""
+
+#: ../tools/browser/canvas/browser-canvas.c:343
+#, fuzzy
+#| msgid "Zoom factor:"
+msgid "Zoom out"
+msgstr "放大倍数："
+
+#: ../tools/browser/canvas/browser-canvas.c:347
+msgid "Adjusted zoom"
+msgstr ""
+
+#: ../tools/browser/canvas/browser-canvas.c:357
msgid "Linear layout"
msgstr "线性布局"
-#: ../tools/browser/canvas/browser-canvas.c:358
+#: ../tools/browser/canvas/browser-canvas.c:362
msgid "Radial layout"
msgstr "径向布局"
-#: ../tools/browser/canvas/browser-canvas.c:465
+#: ../tools/browser/canvas/browser-canvas.c:372
+#, fuzzy
+#| msgid "Save"
+msgid "Save as"
+msgstr "保存"
+
+#: ../tools/browser/canvas/browser-canvas.c:377
+msgid "Print"
+msgstr ""
+
+#: ../tools/browser/canvas/browser-canvas.c:467
msgid "Save diagram as"
msgstr "保存图示为"
-#: ../tools/browser/canvas/browser-canvas.c:473
+#: ../tools/browser/canvas/browser-canvas.c:475
msgid "PNG Image"
msgstr "PNG 图像"
-#: ../tools/browser/canvas/browser-canvas.c:478
+#: ../tools/browser/canvas/browser-canvas.c:480
msgid "SVG file"
msgstr "SVG 文件"
-#: ../tools/browser/canvas/browser-canvas.c:516
+#: ../tools/browser/canvas/browser-canvas.c:518
msgid "Failed to create SVG file"
msgstr "创建 SVG 文件失败"
-#: ../tools/browser/canvas/browser-canvas.c:524
+#: ../tools/browser/canvas/browser-canvas.c:526
msgid "File format to save to is not recognized."
msgstr "要保存到的文件格式未能识别。"
-#: ../tools/browser/canvas/browser-canvas.c:544
+#: ../tools/browser/canvas/browser-canvas.c:546
msgid "Failed to create PNG file"
msgstr "创建 PNG 文件失败"
@@ -7863,15 +8538,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:956
+#: ../tools/browser/schema-browser/table-info.c:992
#, 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:963
-#: ../tools/browser/schema-browser/table-info.c:966
+#: ../tools/browser/schema-browser/table-info.c:999
+#: ../tools/browser/schema-browser/table-info.c:1002
msgid "Successfully declared foreign key"
msgstr "成功声明了外键"
@@ -7885,47 +8560,47 @@ msgstr "添加表"
msgid "Add one table"
msgstr "添加一张表"
-#: ../tools/browser/canvas/browser-canvas-db-relations.c:701
+#: ../tools/browser/canvas/browser-canvas-db-relations.c:694
msgid "Add all tables"
msgstr "添加所有表"
-#: ../tools/browser/canvas/browser-canvas-db-relations.c:716
+#: ../tools/browser/canvas/browser-canvas-db-relations.c:709
msgid "Add all tables in schema"
msgstr "添加方案中的所有表"
-#: ../tools/browser/canvas/browser-canvas-db-relations.c:830
+#: ../tools/browser/canvas/browser-canvas-db-relations.c:823
msgid "Select tables to add to diagram"
msgstr "选择要添加到图示中的表"
#: ../tools/browser/canvas/browser-canvas-fkey.c:422
-#: ../tools/command-exec.c:879
+#: ../tools/common/t-app.c:2049
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:357
-#: ../tools/command-exec.c:911
+#: ../tools/browser/schema-browser/table-columns.c:359
+#: ../tools/common/t-app.c:2081
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:367
-#: ../tools/command-exec.c:915
+#: ../tools/browser/schema-browser/table-columns.c:369
+#: ../tools/common/t-app.c:2085
msgid "Policy on DELETE"
msgstr "DELETE 时的策略"
#: ../tools/browser/canvas/browser-canvas-fkey.c:473
-#: ../tools/browser/schema-browser/table-columns.c:951
+#: ../tools/browser/schema-browser/table-columns.c:961
#, 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:958
-#: ../tools/browser/schema-browser/table-columns.c:961
+#: ../tools/browser/schema-browser/table-columns.c:968
+#: ../tools/browser/schema-browser/table-columns.c:971
msgid "Successfully undeclared foreign key"
msgstr "成功解除了外键声明"
@@ -7974,239 +8649,29 @@ msgstr "<b>页数</b>"
msgid "Print page numbers"
msgstr "打印页码"
-#: ../tools/browser/common/fk-declare.c:186
-#: ../tools/browser/common/fk-declare.c:398
-#, c-format
-msgid "Declare a foreign key for table '%s'"
-msgstr "为表“%s”声明一个外键"
+#: ../tools/browser/connection-binding-properties.c:165
+msgid "New virtual connection"
+msgstr "新虚拟连接"
-#: ../tools/browser/common/fk-declare.c:189
-msgid ""
-"define which table is references, which columns are part of the foreign key, "
-"and which column each one references"
-msgstr ""
-"定义哪张表是引用(references)，哪些列是外键的一部分，及各(表)分别引用了哪一列"
+#: ../tools/browser/connection-binding-properties.c:170
+msgid "Create connection"
+msgstr "创建连接"
-#: ../tools/browser/common/fk-declare.c:208
-msgid "Foreign key name:"
-msgstr "外键名："
+#: ../tools/browser/connection-binding-properties.c:174
+msgid "_Help"
+msgstr "帮助(_H)"
-#. table to reference
-#: ../tools/browser/common/fk-declare.c:219
-msgid "Referenced table:"
-msgstr "引用的表："
-
-#: ../tools/browser/common/fk-declare.c:262
-msgid "Referenced column"
-msgstr "引用的列"
-
-#: ../tools/browser/common/fk-declare.c:560
-msgid "Missing information to declare foreign key"
-msgstr "缺少声明外键所需的信息"
-
-#: ../tools/browser/common/fk-declare.c:642
-msgid "Missing information to undeclare foreign key"
-msgstr "缺少解除声明外键所需的信息"
-
-#: ../tools/browser/common/gdaui-data-import.c:121
-msgid "Import specifications"
-msgstr "导入规范"
-
-#. file to import from
-#: ../tools/browser/common/gdaui-data-import.c:140
-msgid "File to import from:"
-msgstr "要从中导入的文件："
-
-#: ../tools/browser/common/gdaui-data-import.c:144
-msgid "File to import data from"
-msgstr "要从中导入数据的文件"
-
-#: ../tools/browser/common/gdaui-data-import.c:148
-msgid "Comma separated values"
-msgstr "逗号分割的值"
-
-#: ../tools/browser/common/gdaui-data-import.c:153
-msgid "XML exported"
-msgstr "已导出的 XML"
-
-#: ../tools/browser/common/gdaui-data-import.c:157
-msgid "All files"
-msgstr "所有文件"
-
-#. Encoding
-#: ../tools/browser/common/gdaui-data-import.c:165
-msgid "Encoding:"
-msgstr "编码："
-
-#. first line as title
-#: ../tools/browser/common/gdaui-data-import.c:192
-msgid "First line as title:"
-msgstr "第一行作为标题"
-
-#. separator
-#: ../tools/browser/common/gdaui-data-import.c:204
-msgid "Separator:"
-msgstr "分隔符"
-
-#: ../tools/browser/common/gdaui-data-import.c:208
-msgid "Comma"
-msgstr "逗号"
-
-#: ../tools/browser/common/gdaui-data-import.c:215
-msgid "Semi colon"
-msgstr "分号"
-
-#: ../tools/browser/common/gdaui-data-import.c:222
-msgid "Tab"
-msgstr "制表符"
-
-#: ../tools/browser/common/gdaui-data-import.c:229
-msgid "Space"
-msgstr "空格"
-
-#: ../tools/browser/common/gdaui-data-import.c:236
-msgid "Pipe"
-msgstr "管道"
-
-#: ../tools/browser/common/gdaui-data-import.c:245
-msgid "Other:"
-msgstr "其它"
-
-#: ../tools/browser/common/gdaui-data-import.c:269
-msgid "Import preview"
-msgstr "导入预览"
-
-#: ../tools/browser/common/gdaui-data-import.c:285
-msgid "No data."
-msgstr "无数据。"
-
-#: ../tools/browser/common/gdaui-entry-import.c:182
-msgid "Data set import from file"
-msgstr "从文件导入数据集"
-
-#: ../tools/browser/common/gdaui-entry-import.c:215
-#: ../tools/browser/query-exec/query-result.c:230
-#, c-format
-msgid "%d column"
-msgid_plural "%d columns"
-msgstr[0] "%d 列"
-
-#: ../tools/browser/common/gdaui-entry-import.c:216
-#: ../tools/browser/query-exec/query-result.c:232
-#, c-format
-msgid "Data set with %s and %s"
-msgstr "带有 %s and %s 的数据集"
-
-#: ../tools/browser/common/gdaui-entry-import.c:221
-msgid "Modify"
-msgstr "修改"
-
-#: ../tools/browser/common/gdaui-entry-import.c:224
-#: ../tools/browser/common/gdaui-entry-import.c:254
-msgid "Import"
-msgstr "导入"
-
-#: ../tools/browser/common/gdaui-entry-import.c:225
-#: ../tools/browser/common/gdaui-entry-import.c:248
-msgid "No data set"
-msgstr "没有数据集"
-
-#: ../tools/browser/common/objects-cloud.c:251
-#, c-format
-msgid "%d table in current schema:"
-msgid_plural "%d tables in current schema:"
-msgstr[0] "当前方案中的 %d 表："
-
-#: ../tools/browser/common/objects-cloud.c:255
-msgid "Tables in current schema:"
-msgstr "当前方案中的表："
-
-#: ../tools/browser/common/objects-cloud.c:258
-#, c-format
-msgid "%d Table in schema '%s':"
-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:719
-msgid "None"
-msgstr "无"
-
-#: ../tools/browser/common/ui-formgrid.c:338
-#: ../tools/browser/query-exec/query-console-page.c:1076
-msgid "_Execute"
-msgstr "执行(_E)"
-
-#: ../tools/browser/common/ui-formgrid.c:346
-msgid "Enable or disable auto update of data"
-msgstr "启用或禁用自动更新数据"
-
-#: ../tools/browser/common/ui-formgrid.c:364
-msgid "Toggle between grid and form presentations"
-msgstr "在网格和表单表示之间切换"
-
-#: ../tools/browser/common/ui-formgrid.c:505
-msgid "Execute action"
-msgstr "执行操作"
-
-#: ../tools/browser/common/ui-formgrid.c:553
-msgid "View LDAP entry's details"
-msgstr "查看 LDAP 记录详情"
-
-#: ../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:649
-#: ../tools/browser/query-exec/query-console-page.c:1017
-#, c-format
-msgid ""
-"Error executing query:\n"
-"%s"
-msgstr ""
-"执行查询时出错：\n"
-"%s"
-
-#: ../tools/browser/common/ui-formgrid.c:670
-#, c-format
-msgid ""
-"Set or confirm the parameters to execute\n"
-"action '%s'"
-msgstr ""
-"设置或确认要执行的参数\n"
-"操作“%s”"
-
-#: ../tools/browser/common/ui-formgrid.c:674
-msgid "Execution of action"
-msgstr "执行操作"
-
-#: ../tools/browser/common/ui-formgrid.c:751
-#: ../tools/browser/common/ui-formgrid.c:755
-msgid "Action successfully executed"
-msgstr "操作成功执行"
-
-#: ../tools/browser/common/ui-formgrid.c:760
-#: ../tools/browser/schema-browser/table-info.c:537
-#, c-format
-msgid "Error executing query: %s"
-msgstr "执行查询时出错：%s"
-
-#: ../tools/browser/connection-binding-properties.c:155
-msgid "New virtual connection"
-msgstr "新虚拟连接"
-
-#: ../tools/browser/connection-binding-properties.c:160
-msgid "Create connection"
-msgstr "创建连接"
-
-#: ../tools/browser/connection-binding-properties.c:191
-#: ../tools/browser/connection-binding-properties.c:213
+#: ../tools/browser/connection-binding-properties.c:201
msgid "Virtual connection's properties"
msgstr "虚拟连接属性"
-#: ../tools/browser/connection-binding-properties.c:214
+#: ../tools/browser/connection-binding-properties.c:222
+#, fuzzy
+#| msgid "Virtual connection's properties"
+msgid "Virtual connection's properties."
+msgstr "虚拟连接属性"
+
+#: ../tools/browser/connection-binding-properties.c:223
msgid ""
"The virtual connection you are about to define can bind tables from an "
"existing connection as well as bind a data set which will appear as a table "
@@ -8215,57 +8680,81 @@ msgstr ""
"您将要定义的虚拟连接可以绑定现有连接中的表以及绑定数据集使之表现为一张表(如导"
"入的 CSV 数据)。您可以按需添加任意多的绑定"
-#: ../tools/browser/connection-binding-properties.c:280
+#: ../tools/browser/connection-binding-properties.c:286
msgid "Add binding"
msgstr "添加绑定"
-#: ../tools/browser/connection-binding-properties.c:330
+#: ../tools/browser/connection-binding-properties.c:336
msgid "Bind a connection"
msgstr "绑定连接"
-#: ../tools/browser/connection-binding-properties.c:336
+#: ../tools/browser/connection-binding-properties.c:342
msgid "Bind a data set"
msgstr "绑定数据集"
-#: ../tools/browser/connection-binding-properties.c:419
+#: ../tools/browser/connection-binding-properties.c:424
msgid "Bind a data set as a table:"
msgstr "将数据集绑定为一张表："
-#: ../tools/browser/connection-binding-properties.c:423
+#: ../tools/browser/connection-binding-properties.c:428
msgid "Import a data set and make it appear as a table"
msgstr "导入数据集并以表形式展现它"
-#: ../tools/browser/connection-binding-properties.c:426
-#: ../tools/browser/connection-binding-properties.c:536
+#: ../tools/browser/connection-binding-properties.c:431
+#: ../tools/browser/connection-binding-properties.c:538
msgid "Remove this bind"
msgstr "移除此绑定"
-#: ../tools/browser/connection-binding-properties.c:476
+#: ../tools/browser/connection-binding-properties.c:478
msgid "Invalid schema name"
msgstr "无效的方案名"
-#: ../tools/browser/connection-binding-properties.c:526
+#: ../tools/browser/connection-binding-properties.c:528
msgid "Bind all tables of a connection using a schema prefix:"
-msgstr "使用一个方案前缀绑定一个连接的所有表"
+msgstr "使用一个方案前缀绑定一个连接的所有表："
-#: ../tools/browser/connection-binding-properties.c:530
+#: ../tools/browser/connection-binding-properties.c:532
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:563
+#: ../tools/browser/connection-binding-properties.c:552
+#: ../tools/common/t-connection.c:1100
+msgid "Connection"
+msgstr "连接"
+
+#: ../tools/browser/connection-binding-properties.c:553
+msgid "Connection to get tables from in the schema"
+msgstr ""
+
+#: ../tools/browser/connection-binding-properties.c:565
+#: ../tools/common/t-app.c:1759
+msgid "Schema"
+msgstr "方案"
+
+#: ../tools/browser/connection-binding-properties.c:566
msgid ""
"Name of the schema the\n"
"tables will be in"
msgstr "表将位于的方案名"
-#: ../tools/browser/data-manager/analyser.c:192
-msgid "Obtain referenced data in table "
+#: ../tools/browser/data-manager/analyser.c:193
+#, fuzzy, c-format
+#| msgid "Obtain referenced data in table "
+msgid "Obtain referenced data in table %s from "
msgstr "获取引用的数据，在表格 "
-#: ../tools/browser/data-manager/analyser.c:209
-msgid "List referencing data in "
+#: ../tools/browser/data-manager/analyser.c:198
+#, fuzzy, c-format
+#| msgid "Invalid column number %d"
+msgid "column number %d ("
+msgstr "无效的列号 %d"
+
+#: ../tools/browser/data-manager/analyser.c:210
+#, fuzzy, c-format
+#| msgid "List referencing data in "
+msgid "List referencing data in %s."
msgstr "列出以下位置处的引用数据 "
#: ../tools/browser/data-manager/analyser.c:276
@@ -8273,27 +8762,23 @@ msgstr "列出以下位置处的引用数据 "
msgid "Error adding new data source: %s"
msgstr "添加新数据源出错：%s"
-#: ../tools/browser/data-manager/data-console.c:301
+#: ../tools/browser/data-manager/data-console.c:299
msgid "Data Manager"
msgstr "数据管理器"
-#: ../tools/browser/data-manager/data-console.c:301
-#: ../tools/browser/data-manager/data-console.c:517
-#: ../tools/browser/schema-browser/relations-diagram.c:329
-#: ../tools/browser/schema-browser/relations-diagram.c:473
+#: ../tools/browser/data-manager/data-console.c:299
+#: ../tools/browser/data-manager/data-console.c:515
+#: ../tools/browser/schema-browser/relations-diagram.c:330
+#: ../tools/browser/schema-browser/relations-diagram.c:474
msgid "Unsaved"
msgstr "未保存的"
-#: ../tools/browser/data-manager/data-console.c:328
-#: ../tools/browser/query-exec/query-console-page.c:279
+#: ../tools/browser/data-manager/data-console.c:326
+#: ../tools/browser/query-exec/query-console-page.c:270
msgid "Variables' values:"
-msgstr "变量值"
-
-#: ../tools/browser/data-manager/data-console.c:386
-msgid "Reset"
-msgstr "重设"
+msgstr "变量值："
-#: ../tools/browser/data-manager/data-console.c:387
+#: ../tools/browser/data-manager/data-console.c:385
msgid ""
"Reset the editor's\n"
"contents"
@@ -8301,26 +8786,25 @@ msgstr ""
"重设编辑器的\n"
"内容"
-#: ../tools/browser/data-manager/data-console.c:394
+#: ../tools/browser/data-manager/data-console.c:392
msgid "Add a new data source"
msgstr "添加一个新数据源"
-#: ../tools/browser/data-manager/data-console.c:400
-#: ../tools/browser/query-exec/query-console-page.c:313
+#: ../tools/browser/data-manager/data-console.c:398
msgid "Variables"
msgstr "变量"
-#: ../tools/browser/data-manager/data-console.c:400
+#: ../tools/browser/data-manager/data-console.c:398
msgid "Show variables needed"
msgstr "显示需要的变量"
-#: ../tools/browser/data-manager/data-console.c:406
-#: ../tools/browser/ldap-browser/ldap-search-page.c:315
-#: ../tools/browser/query-exec/query-console-page.c:320
+#: ../tools/browser/data-manager/data-console.c:404
+#: ../tools/browser/ldap-browser/ldap-search-page.c:274
+#: ../tools/browser/schema-browser/table-info.c:927
msgid "Execute"
msgstr "执行"
-#: ../tools/browser/data-manager/data-console.c:406
+#: ../tools/browser/data-manager/data-console.c:405
msgid ""
"Execute specified\n"
"data manager"
@@ -8328,11 +8812,11 @@ msgstr ""
"执行指定的\n"
"数据管理器"
-#: ../tools/browser/data-manager/data-console.c:412
+#: ../tools/browser/data-manager/data-console.c:410
msgid "View XML"
msgstr "查看 XML"
-#: ../tools/browser/data-manager/data-console.c:412
+#: ../tools/browser/data-manager/data-console.c:411
msgid ""
"View specifications\n"
"as XML (advanced)"
@@ -8340,74 +8824,69 @@ msgstr ""
"以 XML 查看\n"
"规范(高级)"
-#: ../tools/browser/data-manager/data-console.c:433
+#: ../tools/browser/data-manager/data-console.c:431
msgid "BBB:"
msgstr "BBB："
-#: ../tools/browser/data-manager/data-console.c:505
+#: ../tools/browser/data-manager/data-console.c:503
#, c-format
msgid "'%s' data manager"
msgstr "%s 的数据管理器"
-#: ../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:508
-#: ../tools/browser/schema-browser/table-info.c:486
+#: ../tools/browser/data-manager/data-console.c:504
+#: ../tools/browser/data-manager/data-console.c:515
+#: ../tools/browser/data-manager/data-console.c:542
+#: ../tools/browser/data-manager/data-console.c:941
+#: ../tools/browser/data-manager/perspective-main.c:35
+#: ../tools/browser/schema-browser/relations-diagram.c:506
msgid "Data manager"
msgstr "数据管理器"
-#: ../tools/browser/data-manager/data-console.c:560
+#: ../tools/browser/data-manager/data-console.c:552
msgid "Could not save data manager"
msgstr "无法保存数据管理器"
-#: ../tools/browser/data-manager/data-console.c:586
+#: ../tools/browser/data-manager/data-console.c:578
msgid "Data manager's name"
msgstr "数据管理器名称"
-#: ../tools/browser/data-manager/data-console.c:606
-#: ../tools/browser/ldap-browser/entry-properties.c:275
-#: ../tools/browser/schema-browser/relations-diagram.c:288
+#: ../tools/browser/data-manager/data-console.c:598
+#: ../tools/browser/ldap-browser/entry-properties.c:276
+#: ../tools/browser/schema-browser/relations-diagram.c:289
msgid "Save"
msgstr "保存"
-#: ../tools/browser/data-manager/data-console.c:725
+#: ../tools/browser/data-manager/data-console.c:715
#, c-format
msgid "source%d"
msgstr "源 %d"
-#: ../tools/browser/data-manager/data-console.c:784
+#: ../tools/browser/data-manager/data-console.c:772
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:822
-#: ../tools/browser/schema-browser/table-info.c:333
+#: ../tools/browser/data-manager/data-console.c:810
+#: ../tools/browser/schema-browser/table-info.c:383
#, c-format
msgid "In schema '%s'"
msgstr "在方案“%s”中"
-#: ../tools/browser/data-manager/data-console.c:832
+#: ../tools/browser/data-manager/data-console.c:820
#, c-format
msgid "For table: %s"
msgstr "对于表：%s"
-#: ../tools/browser/data-manager/data-console.c:917
+#: ../tools/browser/data-manager/data-console.c:906
msgid ""
"Switching to execution mode. Hit the Escape key to return to the compose mode"
msgstr "切换为执行模式。按 Escape 键返回编写模式"
-#: ../tools/browser/data-manager/data-console.c:923
-msgid "_Toggle mode"
-msgstr "切换模式(T)"
-
-#: ../tools/browser/data-manager/data-console.c:923
+#: ../tools/browser/data-manager/data-console.c:929
msgid "Switch between compose and execute modes"
msgstr "在编写和执行模式之间切换"
-#: ../tools/browser/data-manager/data-favorite-selector.c:200
+#: ../tools/browser/data-manager/data-favorite-selector.c:192
#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:189
#: ../tools/browser/query-exec/query-favorite-selector.c:190
#: ../tools/browser/schema-browser/favorite-selector.c:169
@@ -8415,68 +8894,58 @@ msgstr "在编写和执行模式之间切换"
msgid "Could not remove favorite: %s"
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:431
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:437
+#: ../tools/browser/data-manager/data-favorite-selector.c:250
+#: ../tools/browser/data-manager/data-favorite-selector.c:598
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:430
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:436
#: ../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:759
-#: ../tools/browser/query-exec/query-console-page.c:789
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:584
+#: ../tools/browser/query-exec/query-console-page.c:757
+#: ../tools/browser/query-exec/query-console-page.c:787
#: ../tools/browser/query-exec/query-favorite-selector.c:265
-#: ../tools/browser/query-exec/query-favorite-selector.c:706
+#: ../tools/browser/query-exec/query-favorite-selector.c:695
#: ../tools/browser/schema-browser/favorite-selector.c:351
-#: ../tools/browser/schema-browser/table-info.c:469
+#: ../tools/browser/schema-browser/table-info.c:519
#, c-format
msgid "Could not add favorite: %s"
msgstr "无法添加到收藏：%s"
-#: ../tools/browser/data-manager/data-favorite-selector.c:289
-#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:283
-#: ../tools/browser/query-exec/query-favorite-selector.c:336
+#: ../tools/browser/data-manager/data-favorite-selector.c:281
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:282
+#: ../tools/browser/query-exec/query-favorite-selector.c:335
msgid "Favorite's properties"
msgstr "收藏属性"
-#: ../tools/browser/data-manager/data-favorite-selector.c:311
+#: ../tools/browser/data-manager/data-favorite-selector.c:303
msgid "Specifications"
msgstr "规范"
-#: ../tools/browser/data-manager/data-favorite-selector.c:482
+#: ../tools/browser/data-manager/data-favorite-selector.c:388
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:372
+msgid "_Properties"
+msgstr "属性(_P)"
+
+#: ../tools/browser/data-manager/data-favorite-selector.c:462
msgid "Saved"
msgstr "已保存"
-#: ../tools/browser/data-manager/data-favorite-selector.c:608
+#: ../tools/browser/data-manager/data-favorite-selector.c:588
msgid "Unnamed data manager"
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:314
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:309
-msgid "_Show Favorites"
+#: ../tools/browser/data-manager/data-manager-perspective.c:356
+#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:353
+#: ../tools/browser/query-exec/query-exec-perspective.c:331
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:342
+#, 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:314
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:309
-msgid "Show or hide favorites"
-msgstr "显示或隐藏收藏"
-
-#: ../tools/browser/data-manager/data-manager-perspective.c:336
-msgid "_Manager"
-msgstr "管理器(_M)"
-
-#: ../tools/browser/data-manager/data-manager-perspective.c:336
-msgid "Manager"
-msgstr "管理器"
-
-#: ../tools/browser/data-manager/data-manager-perspective.c:337
-msgid "_New Data Manager"
-msgstr "新建数据管理器(_N)"
-
-#: ../tools/browser/data-manager/data-manager-perspective.c:337
-msgid "New data manager"
+#: ../tools/browser/data-manager/data-manager-perspective.c:364
+#, fuzzy
+#| msgid "New data manager"
+msgid "New data manager tab"
msgstr "新数据管理器"
#. Translators: Do not translate "table" nor "query"
@@ -8524,27 +8993,28 @@ msgstr "指向“%s”的外键中涉及的字段为未知"
msgid "No SELECT statement to execute"
msgstr "没有要执行的 SELECT 语句"
-#: ../tools/browser/data-manager/data-source.c:928
+#: ../tools/browser/data-manager/data-source.c:927
msgid "Statement to execute is not a selection statement"
msgstr "要执行的语句不是一条选择语句"
-#: ../tools/browser/data-manager/data-source.c:976
-msgid "Refresh data"
-msgstr "刷新数据"
-
-#: ../tools/browser/data-manager/data-source.c:1163
+#: ../tools/browser/data-manager/data-source.c:1141
#, c-format
msgid "Contents of '%s'"
msgstr "'%s' 的内容"
-#: ../tools/browser/data-manager/data-source.c:1174
+#: ../tools/browser/data-manager/data-source.c:1152
msgid "Could not build SELECT statement"
msgstr "无法生成 SELECT 语句"
-#: ../tools/browser/data-manager/data-source.c:1241
+#: ../tools/browser/data-manager/data-source.c:1219
msgid "Multiple statements detected, only the first will be used"
msgstr "检测到多条语句，将只用第一句"
+#: ../tools/browser/data-manager/data-source-editor.c:112
+#: ../tools/browser/ui-formgrid.c:532 ../tools/browser/ui-formgrid.c:543
+msgid "Zoom..."
+msgstr "缩放..."
+
#: ../tools/browser/data-manager/data-source-editor.c:159
msgid "Id"
msgstr "Id"
@@ -8557,11 +9027,11 @@ msgstr ""
"数据源的 ID\n"
"(由其他数据源所引用的)"
-#: ../tools/browser/data-manager/data-source-editor.c:167
+#: ../tools/browser/data-manager/data-source-editor.c:168
msgid "Data source's description"
msgstr "数据源描述"
-#: ../tools/browser/data-manager/data-source-editor.c:171
+#: ../tools/browser/data-manager/data-source-editor.c:175
msgid ""
"Table to display data from, leave empty\n"
"to specify a SELECT statement instead"
@@ -8569,7 +9039,7 @@ msgstr ""
"显示数据来自的表格，\n"
"不填以转而指定一个 SELECT 语句"
-#: ../tools/browser/data-manager/data-source-editor.c:175
+#: ../tools/browser/data-manager/data-source-editor.c:181
msgid ""
"SELECT\n"
"SQL"
@@ -8577,7 +9047,7 @@ msgstr ""
"SELECT\n"
"SQL"
-#: ../tools/browser/data-manager/data-source-editor.c:176
+#: ../tools/browser/data-manager/data-source-editor.c:182
msgid ""
"Actual SQL executed\n"
"to select data\n"
@@ -8585,336 +9055,435 @@ msgid ""
msgstr ""
"如果表名已设置\n"
"实际执行的\n"
-"用来选择数据的 SQL 将无法更改。"
+"用来选择数据的 SQL 将无法更改"
-#: ../tools/browser/data-manager/data-source-editor.c:183
+#: ../tools/browser/data-manager/data-source-editor.c:190
msgid "Dependencies"
msgstr "依赖"
-#: ../tools/browser/data-manager/data-source-editor.c:184
+#: ../tools/browser/data-manager/data-source-editor.c:191
msgid "Required and provided named parameters"
msgstr "要求的和提供的命名参数"
-#: ../tools/browser/data-manager/data-source-editor.c:244
+#: ../tools/browser/data-manager/data-source-editor.c:250
msgid "Requires:"
msgstr "要求："
-#: ../tools/browser/data-manager/data-source-editor.c:256
+#: ../tools/browser/data-manager/data-source-editor.c:262
msgid "Exports:"
msgstr "导出："
-#: ../tools/browser/data-manager/data-widget.c:244
+#: ../tools/browser/data-manager/data-widget.c:243
msgid "Link to other data"
msgstr "链接到其他数据"
-#: ../tools/browser/data-manager/data-widget.c:346
+#: ../tools/browser/data-manager/data-widget.c:344
msgid "Remove data source"
msgstr "移除数据源"
-#: ../tools/browser/data-manager/data-widget.c:352
+#: ../tools/browser/data-manager/data-widget.c:350
msgid "Show data source's properties"
msgstr "显示数据源属性"
-#: ../tools/browser/data-manager/data-widget.c:390
+#: ../tools/browser/data-manager/data-widget.c:386
msgid "No data source defined"
msgstr "没有定义数据源"
-#: ../tools/browser/data-manager/data-widget.c:889
+#: ../tools/browser/data-manager/data-widget.c:885
#, c-format
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:305
+#: ../tools/browser/data-manager/ui-spec-editor.c:162
+#: ../tools/browser/schema-browser/table-columns.c:307
msgid "Remove"
msgstr "删除"
-#: ../tools/browser/data-manager/ui-spec-editor.c:245
+#: ../tools/browser/data-manager/ui-spec-editor.c:233
msgid "Data sources:"
msgstr "数据源："
-#: ../tools/browser/data-manager/ui-spec-editor.c:303
+#: ../tools/browser/data-manager/ui-spec-editor.c:291
msgid "Selected data source's properties:"
msgstr "所选数据源的属性："
-#: ../tools/browser/data-manager/xml-spec-editor.c:174
+#: ../tools/browser/data-manager/xml-spec-editor.c:166
msgid "Error parsing XML specifications"
msgstr "解析 XML 规范出错"
-#: ../tools/browser/data-manager/xml-spec-editor.c:188
+#: ../tools/browser/data-manager/xml-spec-editor.c:180
#, c-format
msgid "Expecting <%s> root node"
msgstr "应为 <%s> 根节点"
-#: ../tools/browser/data-manager/xml-spec-editor.c:318
-#: ../tools/browser/query-exec/query-console-page.c:259
+#: ../tools/browser/data-manager/xml-spec-editor.c:310
+#: ../tools/browser/query-exec/query-console-page.c:250
msgid "SQL code to execute:"
msgstr "要执行的 SQL 代码："
-#: ../tools/browser/gda-browser-6.0.desktop.in.h:2
-msgid "Browse your database's contents"
-msgstr "浏览您的数据库内容"
+#: ../tools/browser/fk-declare.c:128
+msgid "_Add"
+msgstr ""
-#: ../tools/browser/ldap-browser/class-properties.c:407
-msgid "Could not get information about LDAP class"
-msgstr "无法获取有关 LDAP 类的信息"
+#: ../tools/browser/fk-declare.c:183 ../tools/browser/fk-declare.c:393
+#, c-format
+msgid "Declare a foreign key for table '%s'"
+msgstr "为表“%s”声明一个外键"
-#: ../tools/browser/ldap-browser/class-properties.c:427
-msgid "Class OID:"
-msgstr "类 OID："
+#: ../tools/browser/fk-declare.c:186
+#, fuzzy
+#| msgid ""
+#| "define which table is references, which columns are part of the foreign "
+#| "key, and which column each one references"
+msgid ""
+"define which table is referenced, which columns are part of the foreign key, "
+"and which column each one references"
+msgstr ""
+"定义哪张表是引用(references)，哪些列是外键的一部分，及各(表)分别引用了哪一列"
-#: ../tools/browser/ldap-browser/class-properties.c:438
-msgid "Class kind:"
-msgstr "类类型："
+#. FK name
+#: ../tools/browser/fk-declare.c:205
+msgid "Foreign key name:"
+msgstr "外键名："
-#: ../tools/browser/ldap-browser/class-properties.c:452
-msgid "Class name:"
-msgid_plural "Class names:"
-msgstr[0] "类名："
+#. table to reference
+#: ../tools/browser/fk-declare.c:215
+msgid "Referenced table:"
+msgstr "引用的表："
-#: ../tools/browser/ldap-browser/class-properties.c:465
-msgid "This LDAP class is obsolete"
-msgstr "此 LDAP 类已废弃"
+#: ../tools/browser/fk-declare.c:257
+msgid "Referenced column"
+msgstr "引用的列"
-#: ../tools/browser/ldap-browser/class-properties.c:473
-msgid "Required attribute:"
-msgid_plural "Required attributes:"
-msgstr[0] "必需的属性："
+#: ../tools/browser/fk-declare.c:555
+msgid "Missing information to declare foreign key"
+msgstr "缺少声明外键所需的信息"
-#: ../tools/browser/ldap-browser/class-properties.c:489
-msgid "Optional attribute:"
-msgid_plural "Optional attributes:"
-msgstr[0] "可选的属性："
+#: ../tools/browser/fk-declare.c:637
+msgid "Missing information to undeclare foreign key"
+msgstr "缺少解除声明外键所需的信息"
-#: ../tools/browser/ldap-browser/class-properties.c:508
-msgid "Children class:"
-msgid_plural "Children classes:"
-msgstr[0] "子类："
+#: ../tools/browser/gdaui-data-import.c:121
+msgid "Import specifications"
+msgstr "导入规范"
-#: ../tools/browser/ldap-browser/class-properties.c:553
-msgid "Inherited class:"
-msgid_plural "Inherited classes:"
-msgstr[0] "继承类："
+#. file to import from
+#: ../tools/browser/gdaui-data-import.c:140
+msgid "File to import from:"
+msgstr "要从中导入的文件："
-#: ../tools/browser/ldap-browser/entry-properties.c:222
-msgid "Select the file to save data to"
-msgstr "选择用于保存数据的文件"
+#: ../tools/browser/gdaui-data-import.c:144
+msgid "File to import data from"
+msgstr "要从中导入数据的文件"
-#: ../tools/browser/ldap-browser/entry-properties.c:243
-#, c-format
-msgid "Could not save data: %s"
-msgstr "无法保存数据：%s"
+#: ../tools/browser/gdaui-data-import.c:148
+msgid "Comma separated values"
+msgstr "逗号分割的值"
-#: ../tools/browser/ldap-browser/entry-properties.c:532
-msgid "Non activated"
+#: ../tools/browser/gdaui-data-import.c:153
+msgid "XML exported"
+msgstr "已导出的 XML"
+
+#: ../tools/browser/gdaui-data-import.c:157
+msgid "All files"
+msgstr "所有文件"
+
+#. Encoding
+#: ../tools/browser/gdaui-data-import.c:165
+msgid "Encoding:"
+msgstr "编码："
+
+#. first line as title
+#: ../tools/browser/gdaui-data-import.c:192
+msgid "First line as title:"
+msgstr "第一行（作为标题）："
+
+#. separator
+#: ../tools/browser/gdaui-data-import.c:204
+msgid "Separator:"
+msgstr "分隔符："
+
+#: ../tools/browser/gdaui-data-import.c:208
+msgid "Comma"
+msgstr "逗号"
+
+#: ../tools/browser/gdaui-data-import.c:215
+msgid "Semi colon"
+msgstr "分号"
+
+#: ../tools/browser/gdaui-data-import.c:222
+msgid "Tab"
+msgstr "制表符"
+
+#: ../tools/browser/gdaui-data-import.c:229
+msgid "Space"
+msgstr "空格"
+
+#: ../tools/browser/gdaui-data-import.c:236
+msgid "Pipe"
+msgstr "管道"
+
+#: ../tools/browser/gdaui-data-import.c:245
+msgid "Other:"
+msgstr "其它："
+
+#: ../tools/browser/gdaui-data-import.c:269
+msgid "Import preview"
+msgstr "导入预览"
+
+#: ../tools/browser/gdaui-data-import.c:285
+msgid "No data."
+msgstr "无数据。"
+
+#: ../tools/browser/gdaui-entry-import.c:182
+msgid "Data set import from file"
+msgstr "从文件导入数据集"
+
+#: ../tools/browser/gdaui-entry-import.c:185
+msgid "_OK"
+msgstr ""
+
+#: ../tools/browser/gdaui-entry-import.c:213
+#: ../tools/browser/query-exec/query-result.c:230
+#, c-format
+msgid "%d column"
+msgid_plural "%d columns"
+msgstr[0] "%d 列"
+
+#: ../tools/browser/gdaui-entry-import.c:214
+#: ../tools/browser/query-exec/query-result.c:232
+#, c-format
+msgid "Data set with %s and %s"
+msgstr "带有 %s and %s 的数据集"
+
+#: ../tools/browser/gdaui-entry-import.c:219
+msgid "Modify"
+msgstr "修改"
+
+#: ../tools/browser/gdaui-entry-import.c:222
+#: ../tools/browser/gdaui-entry-import.c:250
+msgid "Import"
+msgstr "导入"
+
+#: ../tools/browser/gdaui-entry-import.c:223
+#: ../tools/browser/gdaui-entry-import.c:245
+msgid "No data set"
+msgstr "没有数据集"
+
+#: ../tools/browser/ldap-browser/class-properties.c:408
+msgid "Could not get information about LDAP class"
+msgstr "无法获取有关 LDAP 类的信息"
+
+#: ../tools/browser/ldap-browser/class-properties.c:428
+msgid "Class OID:"
+msgstr "类 OID："
+
+#: ../tools/browser/ldap-browser/class-properties.c:439
+msgid "Class kind:"
+msgstr "类类型："
+
+#: ../tools/browser/ldap-browser/class-properties.c:453
+msgid "Class name:"
+msgid_plural "Class names:"
+msgstr[0] "类名："
+
+#: ../tools/browser/ldap-browser/class-properties.c:466
+msgid "This LDAP class is obsolete"
+msgstr "此 LDAP 类已废弃"
+
+#: ../tools/browser/ldap-browser/class-properties.c:474
+msgid "Required attribute:"
+msgid_plural "Required attributes:"
+msgstr[0] "必需的属性："
+
+#: ../tools/browser/ldap-browser/class-properties.c:490
+msgid "Optional attribute:"
+msgid_plural "Optional attributes:"
+msgstr[0] "可选的属性："
+
+#: ../tools/browser/ldap-browser/class-properties.c:509
+msgid "Children class:"
+msgid_plural "Children classes:"
+msgstr[0] "子类："
+
+#: ../tools/browser/ldap-browser/class-properties.c:554
+msgid "Inherited class:"
+msgid_plural "Inherited classes:"
+msgstr[0] "继承类："
+
+#: ../tools/browser/ldap-browser/entry-properties.c:223
+msgid "Select the file to save data to"
+msgstr "选择用于保存数据的文件"
+
+#: ../tools/browser/ldap-browser/entry-properties.c:244
+#, c-format
+msgid "Could not save data: %s"
+msgstr "无法保存数据：%s"
+
+#: ../tools/browser/ldap-browser/entry-properties.c:533
+msgid "Non activated"
msgstr "无一激活"
-#: ../tools/browser/ldap-browser/entry-properties.c:580
-#: ../tools/browser/ldap-browser/entry-properties.c:584
+#: ../tools/browser/ldap-browser/entry-properties.c:581
+#: ../tools/browser/ldap-browser/entry-properties.c:585
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:957
+#: ../tools/browser/ldap-browser/entry-properties.c:956
msgid "Could not get information about LDAP entry"
msgstr "无法获取有关 LDAP 记录的信息"
-#: ../tools/browser/ldap-browser/filter-editor.c:152
+#: ../tools/browser/ldap-browser/filter-editor.c:151
msgid "Base DN:"
msgstr "基 DN："
-#: ../tools/browser/ldap-browser/filter-editor.c:156
+#: ../tools/browser/ldap-browser/filter-editor.c:154
msgid "Filter expression:"
msgstr "过滤表达式："
-#: ../tools/browser/ldap-browser/filter-editor.c:160
+#: ../tools/browser/ldap-browser/filter-editor.c:157
msgid "Attributes to fetch:"
msgstr "要获取的属性："
-#: ../tools/browser/ldap-browser/filter-editor.c:164
+#: ../tools/browser/ldap-browser/filter-editor.c:160
msgid "Search scope:"
msgstr "搜索范围："
-#: ../tools/browser/ldap-browser/hierarchy-view.c:522
+#: ../tools/browser/ldap-browser/hierarchy-view.c:521
#, c-format
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:507
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:513
-#: ../tools/browser/ldap-browser/ldap-search-page.c:451
-msgid "_LDAP"
-msgstr "_LDAP"
-
-#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:336
-#: ../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:451
-#: ../tools/gda-sql.c:2413 ../tools/gda-sql.c:2421 ../tools/gda-sql.c:2433
-#: ../tools/gda-sql.c:2441
-msgid "LDAP"
-msgstr "LDAP"
-
-#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:337
-msgid "_New LDAP Entries Browser"
-msgstr "新建 LDAP 记录浏览器(_N)"
-
-#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:337
-msgid "Open a new LDAP entries browser"
-msgstr "打开一个新 LDAP 记录浏览器"
-
-#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:339
-msgid "_New LDAP Classes Browser"
-msgstr "新建 LDAP 类浏览器(_N)"
+#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:366
+#, fuzzy
+#| msgid "LDAP entries"
+msgid "New LDAP entries tab"
+msgstr "LDAP 记录"
-#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:339
-msgid "Open a new LDAP classes browser"
-msgstr "打开一个新 LDAP 类浏览器"
+#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:377
+#, fuzzy
+#| msgid "LDAP classes"
+msgid "New LDAP classes tab"
+msgstr "LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:341
-msgid "_New LDAP Search"
+#: ../tools/browser/ldap-browser/ldap-browser-perspective.c:385
+#, fuzzy
+#| msgid "_New LDAP Search"
+msgid "New LDAP search tab"
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:317
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:316
msgid "LDAP classes browser"
msgstr "LDAP 类浏览器"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:337
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:573
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:335
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:561
msgid "LDAP classes"
msgstr "LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:364
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:361
msgid "LDAP class's properties"
msgstr "LDAP 类的属性"
-#: ../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:974
-msgid "Add to _Favorites"
-msgstr "添加到收藏(_F)"
-
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:508
-msgid "Add class to favorites"
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:531
+#, fuzzy
+#| msgid "Add class to favorites"
+msgid "Add class to Favorites"
msgstr "添加类到收藏"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:510
-msgid "Previous Class"
-msgstr "上个类"
-
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:510
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:539
msgid "Move back to previous LDAP class"
msgstr "后退到上个 LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:512
-msgid "Next Class"
-msgstr "下个类"
-
-#: ../tools/browser/ldap-browser/ldap-classes-page.c:512
+#: ../tools/browser/ldap-browser/ldap-classes-page.c:547
msgid "Move to next LDAP class"
msgstr "前进到下个 LDAP 类"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:323
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:322
msgid "LDAP entries browser"
msgstr "LDAP 记录浏览器"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:343
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:341
msgid "LDAP hierarchy"
msgstr "LDAP 层次结构"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:370
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:367
msgid "LDAP entry's details"
msgstr "LDAP 记录详情"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:514
-msgid "Add entry to favorites"
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:537
+#, fuzzy
+#| msgid "Add entry to favorites"
+msgid "Add entry to Favorites"
msgstr "添加记录到收藏"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:516
-msgid "Previous Entry"
-msgstr "上一记录"
-
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:516
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:545
msgid "Move back to previous LDAP entry"
msgstr "后退到上个 LDAP 记录"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:518
-msgid "Next Entry"
-msgstr "下一记录"
-
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:518
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:553
msgid "Move to next LDAP entry"
msgstr "前进到下个 LDAP 记录"
-#: ../tools/browser/ldap-browser/ldap-entries-page.c:579
+#: ../tools/browser/ldap-browser/ldap-entries-page.c:567
msgid "LDAP entries"
msgstr "LDAP 记录"
-#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:477
-#: ../tools/browser/query-exec/query-favorite-selector.c:563
+#: ../tools/browser/ldap-browser/ldap-favorite-selector.c:462
+#: ../tools/browser/query-exec/query-favorite-selector.c:552
#: ../tools/browser/schema-browser/favorite-selector.c:245
msgid "Favorites"
msgstr "收藏"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:274
+#: ../tools/browser/ldap-browser/ldap-search-page.c:235
msgid "LDAP search page"
msgstr "LDAP 搜索页面"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:284
+#: ../tools/browser/ldap-browser/ldap-search-page.c:244
msgid "LDAP search settings"
msgstr "LDAP 搜索设置"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:309
-#: ../tools/browser/query-exec/query-console-page.c:307
-#: ../tools/browser/query-exec/query-console-page.c:376
+#: ../tools/browser/ldap-browser/ldap-search-page.c:268
msgid "Clear"
msgstr "清理"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:310
+#: ../tools/browser/ldap-browser/ldap-search-page.c:269
msgid "Clear the search settings"
msgstr "清除搜索设置"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:316
+#: ../tools/browser/ldap-browser/ldap-search-page.c:275
msgid "Execute LDAP search"
msgstr "执行 LDAP 搜索"
#. results
-#: ../tools/browser/ldap-browser/ldap-search-page.c:322
+#: ../tools/browser/ldap-browser/ldap-search-page.c:281
msgid "Results"
msgstr "结果"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:370
+#: ../tools/browser/ldap-browser/ldap-search-page.c:331
#, c-format
msgid "Could not define virtual table for this LDAP search: %s"
msgstr "无法为此 LDAP 搜索定义虚拟表：%s"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:376
+#: ../tools/browser/ldap-browser/ldap-search-page.c:337
#, c-format
msgid "Virtual table '%s' for this LDAP search has been defined"
msgstr "此 LDAP 搜索的虚拟表“%s”已经定义"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:452
-msgid "Define as Table"
-msgstr "定义为表"
-
-#: ../tools/browser/ldap-browser/ldap-search-page.c:452
+#: ../tools/browser/ldap-browser/ldap-search-page.c:361
msgid "Define search as a virtual table"
msgstr "将搜索定义为虚拟表"
-#: ../tools/browser/ldap-browser/ldap-search-page.c:526
+#: ../tools/browser/ldap-browser/ldap-search-page.c:373
msgid "LDAP search"
msgstr "LDAP 搜索"
@@ -8941,11 +9510,11 @@ msgstr "表名："
msgid "Replace if exists:"
msgstr "若存在则替换："
-#: ../tools/browser/login-dialog.c:138
+#: ../tools/browser/login-dialog.c:133
msgid "Connection opening:"
msgstr "正在打开的连接："
-#: ../tools/browser/login-dialog.c:139
+#: ../tools/browser/login-dialog.c:134
msgid ""
"Select a named data source, or specify\n"
"parameters to open a connection to a \n"
@@ -8954,39 +9523,10 @@ msgstr ""
"选择一个命名数据源，或指定参数\n"
"以打开一个到未定义数据源的连接"
-#: ../tools/browser/login-dialog.c:248
+#: ../tools/browser/login-dialog.c:243
msgid "Cancelled by the user"
msgstr "被用户取消"
-#: ../tools/browser/main.c:105 ../tools/gda-sql.c:186
-msgid "[DSN|connection string]..."
-msgstr "[DSN|连接字符串]..."
-
-#: ../tools/browser/main.c:130 ../tools/browser/main.c:149
-#: ../tools/gda-list-server-op.c:126
-#, c-format
-msgid "Error: %s\n"
-msgstr "错误：%s\n"
-
-#: ../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: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:319
-#, c-format
-msgid ""
-"Error while purging files used to store information about each connection: "
-"%s\n"
-msgstr "在冲洗(purge)用于保存各个连接信息的文件时出错：%s\n"
-
#: ../tools/browser/mgr-favorites.c:251
msgid "Multiple statements"
msgstr "多个语句"
@@ -9039,7 +9579,7 @@ msgstr "DELETE SAVEPOINT 语句"
msgid "Unknown statement"
msgstr "未知语句"
-#: ../tools/browser/mgr-favorites.c:758
+#: ../tools/browser/mgr-favorites.c:757
msgid ""
"Getting\n"
"favorites..."
@@ -9047,7 +9587,7 @@ msgstr ""
"正在获取\n"
"收藏..."
-#: ../tools/browser/mgr-favorites.c:770
+#: ../tools/browser/mgr-favorites.c:769
msgid ""
"No favorite:\n"
"drag item to\n"
@@ -9057,16 +9597,57 @@ msgstr ""
"拖动条目\n"
"可以定义"
-#: ../tools/browser/query-exec/perspective-main.c:33
+#: ../tools/browser/objects-cloud.c:251
+#, c-format
+msgid "%d table in current schema:"
+msgid_plural "%d tables in current schema:"
+msgstr[0] "当前方案中的 %d 表："
+
+#: ../tools/browser/objects-cloud.c:255
+msgid "Tables in current schema:"
+msgstr "当前方案中的表："
+
+#: ../tools/browser/objects-cloud.c:258
+#, c-format
+msgid "%d Table in schema '%s':"
+msgid_plural "%d Tables in schema '%s':"
+msgstr[0] "方案 '%2$s' 中的 %1$d 表："
+
+#. no connection at all or not authenticated
+#: ../tools/browser/objects-cloud.c:268 ../tools/common/web-server.c:651
+msgid "None"
+msgstr "无"
+
+#: ../tools/browser/org.gnome.gda.Browser.appdata.xml.in.h:1
+msgid "View the schema and data of databases"
+msgstr ""
+
+#: ../tools/browser/org.gnome.gda.Browser.appdata.xml.in.h:2
+msgid ""
+"Database Browser provides quick access to the data and schema of a database, "
+"and displays it in a intuitive graphical interface. It provides three "
+"perspectives to interact with a database: the schema browser, query "
+"execution, and data manager. The schema browser allows the user to view the "
+"tables of a database, and inspect the table's properties and relations. The "
+"query execution perspective allows the user to execute SQL queries on the "
+"database. The data manager perspective allows the user to view the data "
+"contained in the database in a tabular form."
+msgstr ""
+
+#: ../tools/browser/org.gnome.gda.Browser.desktop.in.h:1
+msgid "SGBD;PostgreSQL;MySQL;SQLite;JDBC;LDAP;"
+msgstr ""
+
+#: ../tools/browser/query-exec/perspective-main.c:35
msgid "Query execution (SQL)"
msgstr "查询执行 (SQL)"
-#: ../tools/browser/query-exec/query-console-page.c:233
-#: ../tools/browser/query-exec/query-console-page.c:1125
+#: ../tools/browser/query-exec/query-console-page.c:226
+#: ../tools/browser/query-exec/query-console-page.c:1098
msgid "Query editor"
msgstr "查询编辑器"
-#: ../tools/browser/query-exec/query-console-page.c:308
+#: ../tools/browser/query-exec/query-console-page.c:302
msgid ""
"Clear the editor's\n"
"contents"
@@ -9074,7 +9655,7 @@ msgstr ""
"清理编辑器\n"
"内容"
-#: ../tools/browser/query-exec/query-console-page.c:314
+#: ../tools/browser/query-exec/query-console-page.c:309
msgid ""
"Show variables needed\n"
"to execute SQL"
@@ -9082,15 +9663,11 @@ msgstr ""
"显示执行 SQL 所\n"
"需要的变量"
-#: ../tools/browser/query-exec/query-console-page.c:320
+#: ../tools/browser/query-exec/query-console-page.c:317
msgid "Execute SQL in editor"
msgstr "在编辑器中执行 SQL"
#: ../tools/browser/query-exec/query-console-page.c:326
-msgid "Indent"
-msgstr "缩进"
-
-#: ../tools/browser/query-exec/query-console-page.c:327
msgid ""
"Indent SQL in editor\n"
"and make the code more readable\n"
@@ -9099,11 +9676,7 @@ msgstr ""
"在编辑器中缩进 SQL\n"
"以使代码更易读(删除注释)"
-#: ../tools/browser/query-exec/query-console-page.c:335
-msgid "Favorite"
-msgstr "收藏"
-
-#: ../tools/browser/query-exec/query-console-page.c:336
+#: ../tools/browser/query-exec/query-console-page.c:337
msgid "Add SQL to favorite"
msgstr "向收藏中添加 SQL"
@@ -9111,10 +9684,6 @@ msgstr "向收藏中添加 SQL"
msgid "Execution history:"
msgstr "执行历史："
-#: ../tools/browser/query-exec/query-console-page.c:368
-msgid "Copy"
-msgstr "复制"
-
#: ../tools/browser/query-exec/query-console-page.c:369
msgid ""
"Copy selected history\n"
@@ -9123,11 +9692,11 @@ msgstr ""
"复制选中的历史\n"
"到编辑器"
-#: ../tools/browser/query-exec/query-console-page.c:377
+#: ../tools/browser/query-exec/query-console-page.c:378
msgid "Clear history"
msgstr "清理历史"
-#: ../tools/browser/query-exec/query-console-page.c:389
+#: ../tools/browser/query-exec/query-console-page.c:390
msgid "Execution Results:"
msgstr "执行结果："
@@ -9145,45 +9714,45 @@ msgstr "修改收藏“%s”"
msgid "Modify a favorite"
msgstr "修改收藏"
-#: ../tools/browser/query-exec/query-console-page.c:732
-#: ../tools/browser/query-exec/query-console-page.c:752
+#: ../tools/browser/query-exec/query-console-page.c:730
+#: ../tools/browser/query-exec/query-console-page.c:750
msgid "Favorite's name"
msgstr "收藏的名称"
-#: ../tools/browser/query-exec/query-console-page.c:733
-#: ../tools/browser/query-exec/query-favorite-selector.c:696
+#: ../tools/browser/query-exec/query-console-page.c:731
+#: ../tools/browser/query-exec/query-favorite-selector.c:685
msgid "Unnamed query"
msgstr "未命名查询"
-#: ../tools/browser/query-exec/query-console-page.c:736
+#: ../tools/browser/query-exec/query-console-page.c:734
msgid "Name of the favorite to create"
msgstr "要创建的收藏的名称"
-#: ../tools/browser/query-exec/query-console-page.c:737
+#: ../tools/browser/query-exec/query-console-page.c:735
msgid "Enter the name of the favorite to create"
msgstr "输入要创建的收藏的名称"
-#: ../tools/browser/query-exec/query-console-page.c:868
+#: ../tools/browser/query-exec/query-console-page.c:866
msgid "Invalid variable's contents"
msgstr "无效的变量内容"
-#: ../tools/browser/query-exec/query-console-page.c:869
-#: ../tools/browser/schema-browser/table-info.c:908
+#: ../tools/browser/query-exec/query-console-page.c:867
+#: ../tools/browser/schema-browser/table-info.c:947
msgid "assign values to the following variables"
msgstr "为如下变量假设值"
-#: ../tools/browser/query-exec/query-console-page.c:934
+#: ../tools/browser/query-exec/query-console-page.c:931
msgid ""
"A query is already being executed, to execute another query, open a new "
"connection."
msgstr "查询已经执行，要执行另一个查询，请打开一个新连接。"
-#: ../tools/browser/query-exec/query-console-page.c:946
+#: ../tools/browser/query-exec/query-console-page.c:943
#, c-format
msgid "Error while parsing code: %s"
msgstr "解析代码时出错：%s"
-#: ../tools/browser/query-exec/query-console-page.c:1001
+#: ../tools/browser/query-exec/query-console-page.c:999
msgid ""
"A transaction has automatically been started\n"
"during this statement's execution, this usually\n"
@@ -9196,88 +9765,98 @@ msgstr ""
"这通常发生在选择了 blob 时(在 blob 可访问的情况下\n"
"事务得保持打开，在关闭事务前请清理对应历史)。"
-#: ../tools/browser/query-exec/query-console-page.c:1013
+#: ../tools/browser/query-exec/query-console-page.c:1011
msgid "Statement executed"
msgstr "语句已经执行"
-#: ../tools/browser/query-exec/query-console-page.c:1033
+#: ../tools/browser/query-exec/query-console-page.c:1015
+#, c-format
+msgid ""
+"Error executing query:\n"
+"%s"
+msgstr ""
+"执行查询时出错：\n"
+"%s"
+
+#: ../tools/browser/query-exec/query-console-page.c:1031
+#, fuzzy
+#| msgid ""
+#| "Internal error, please report error to http://bugzilla.gnome.org/ for the "
+#| "\"libgda\" product"
msgid ""
-"Internal error, please report error to http://bugzilla.gnome.org/ for the "
-"\"libgda\" product"
+"Internal error, please report error to http://gitlab.gnome.org/GNOME/libgda/";
+"issues"
msgstr "内部错误，请向 http://bugzilla.gnome.org/ 报告“libgda”产品的错误"
-#: ../tools/browser/query-exec/query-console-page.c:1076
+#: ../tools/browser/query-exec/query-console-page.c:1086
msgid "Execute query"
msgstr "执行查询"
-#: ../tools/browser/query-exec/query-console-page.c:1079
-msgid "_Undo"
-msgstr "撤销(_U)"
-
-#: ../tools/browser/query-exec/query-console-page.c:1079
-msgid "Undo last change"
-msgstr "撤销最后的更改"
-
-#: ../tools/browser/query-exec/query-editor.c:698
+#: ../tools/browser/query-exec/query-editor.c:689
msgid "Copy all in a single line"
msgstr "将所有内容复制成一行"
-#: ../tools/browser/query-exec/query-editor.c:1245
+#: ../tools/browser/query-exec/query-editor.c:1209
msgid "In the future:\n"
msgstr "未来：\n"
-#: ../tools/browser/query-exec/query-editor.c:1249
+#: ../tools/browser/query-exec/query-editor.c:1213
msgid "Less than a minute ago:\n"
msgstr "不到一分钟以前：\n"
-#: ../tools/browser/query-exec/query-editor.c:1254
+#: ../tools/browser/query-exec/query-editor.c:1218
#, c-format
msgid "%lu minute ago:\n"
msgid_plural "%lu minutes ago:\n"
msgstr[0] "%lu 分钟以前：\n"
-#: ../tools/browser/query-exec/query-editor.c:1261
+#: ../tools/browser/query-exec/query-editor.c:1225
#, c-format
msgid "%lu hour ago\n"
msgid_plural "%lu hours ago\n"
msgstr[0] "%lu 小时之前\n"
-#: ../tools/browser/query-exec/query-editor.c:1267
+#: ../tools/browser/query-exec/query-editor.c:1231
#, 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:318
-msgid "_Query"
-msgstr "查询(_Q)"
-
-#: ../tools/browser/query-exec/query-exec-perspective.c:318
-msgid "Query"
-msgstr "查询"
-
-#: ../tools/browser/query-exec/query-exec-perspective.c:319
-msgid "_New Editor"
-msgstr "新编辑器(_N)"
+#: ../tools/browser/query-exec/query-editor.h:34
+msgid ""
+"Enter SQL code to execute\n"
+"(must be understood by the database to\n"
+"which the connection is opened, except for the variables definition)\n"
+"The following shortcuts are allowed:\n"
+" <small><b>CTRL - l</b></small> to clear the editor\n"
+" <small><b>CTRL - ENTER</b></small> to execute SQL\n"
+" <small><b>CTRL - Up</b></small> to move to previous executed SQL in "
+"history\n"
+" <small><b>CTRL - Down</b></small> to move to next executed SQL in "
+"history\n"
+" <small><b>CTRL - SPACE</b></small> to obtain a completion list"
+msgstr ""
-#: ../tools/browser/query-exec/query-exec-perspective.c:319
-msgid "Open a new query editor"
-msgstr "打开一个新查询编辑器"
+#: ../tools/browser/query-exec/query-exec-perspective.c:339
+#, fuzzy
+#| msgid "Query execution (SQL)"
+msgid "New query execution tab"
+msgstr "查询执行 (SQL)"
#: ../tools/browser/query-exec/query-favorite-selector.c:286
#, c-format
msgid "Could not add action: %s"
msgstr "无法添加操作：%s"
-#: ../tools/browser/query-exec/query-favorite-selector.c:360
+#: ../tools/browser/query-exec/query-favorite-selector.c:357
msgid "SQL Code"
msgstr "SQL 代码"
-#: ../tools/browser/query-exec/query-favorite-selector.c:367
+#: ../tools/browser/query-exec/query-favorite-selector.c:364
msgid "Is action"
msgstr "是操作"
-#: ../tools/browser/query-exec/query-favorite-selector.c:370
+#: ../tools/browser/query-exec/query-favorite-selector.c:367
msgid ""
"Check this option to make this favorite an action\n"
"which can be proposed for execution from grids\n"
@@ -9285,27 +9864,12 @@ msgid ""
"the query will be defined from the row selected in the grid"
msgstr ""
"选择此项使该收藏成为一项可从包含数据的网格发起执行的\n"
-"操作。执行该查询的参数将由网格中选择的行定义。"
+"操作。执行该查询的参数将由网格中选择的行定义"
#: ../tools/browser/query-exec/query-result.c:219
msgid "Statement:"
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/cmdtool/tool-output.c:89 ../tools/cmdtool/tool-output.c:495
-#: ../tools/cmdtool/tool-output.c:577 ../tools/gda-sql.c:1740
-#, c-format
-msgid "Execution delay"
-msgstr "执行延迟"
-
-#: ../tools/browser/query-exec/query-result.c:260
-#: ../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 "影响的行数"
-
#: ../tools/browser/query-exec/query-result.c:293
msgid "Execution Parameters"
msgstr "执行参数"
@@ -9314,11 +9878,7 @@ msgstr "执行参数"
msgid "No result selected"
msgstr "没有选中的结果"
-#: ../tools/browser/query-exec/query-result.c:398
-msgid "Re-execute query"
-msgstr "重新执行查询"
-
-#: ../tools/browser/query-exec/query-result.c:496
+#: ../tools/browser/query-exec/query-result.c:475
msgid "Execution error:\n"
msgstr "执行错误：\n"
@@ -9330,140 +9890,140 @@ msgstr "没有找到表"
msgid "Requested object is not a table or view"
msgstr "请求的对象不是一个表或者视图"
-#: ../tools/browser/schema-browser/mgr-columns.c:394
+#: ../tools/browser/schema-browser/mgr-columns.c:392
msgid "Auto incremented"
msgstr "自动增加"
-#: ../tools/browser/schema-browser/objects-index.c:175
-msgid "Tables' index"
-msgstr "表索引"
+#: ../tools/browser/schema-browser/objects-index.c:176
+msgid "Index of tables and views"
+msgstr ""
-#: ../tools/browser/schema-browser/perspective-main.c:33
+#: ../tools/browser/schema-browser/perspective-main.c:35
msgid "Schema browser"
msgstr "方案浏览器"
-#: ../tools/browser/schema-browser/relations-diagram.c:232
-#: ../tools/browser/schema-browser/relations-diagram.c:566
+#: ../tools/browser/schema-browser/relations-diagram.c:233
+#: ../tools/browser/schema-browser/relations-diagram.c:556
msgid "Diagram"
msgstr "图示"
-#: ../tools/browser/schema-browser/relations-diagram.c:242
+#: ../tools/browser/schema-browser/relations-diagram.c:243
msgid "Could not save diagram"
msgstr "无法保存图示"
-#: ../tools/browser/schema-browser/relations-diagram.c:268
+#: ../tools/browser/schema-browser/relations-diagram.c:269
msgid "Canvas's name"
msgstr "画布名"
-#: ../tools/browser/schema-browser/relations-diagram.c:329
-#: ../tools/browser/schema-browser/relations-diagram.c:382
-#: ../tools/browser/schema-browser/relations-diagram.c:462
-#: ../tools/browser/schema-browser/relations-diagram.c:473
+#: ../tools/browser/schema-browser/relations-diagram.c:330
+#: ../tools/browser/schema-browser/relations-diagram.c:383
+#: ../tools/browser/schema-browser/relations-diagram.c:463
+#: ../tools/browser/schema-browser/relations-diagram.c:474
msgid "Relations diagram"
msgstr "关系图示"
-#: ../tools/browser/schema-browser/relations-diagram.c:372
+#: ../tools/browser/schema-browser/relations-diagram.c:373
msgid "Error parsing favorite's contents"
msgstr "解析收藏内容出错"
-#: ../tools/browser/schema-browser/relations-diagram.c:381
-#: ../tools/browser/schema-browser/relations-diagram.c:461
+#: ../tools/browser/schema-browser/relations-diagram.c:382
+#: ../tools/browser/schema-browser/relations-diagram.c:462
#, c-format
msgid "'%s' diagram"
msgstr "“%s”图示"
-#: ../tools/browser/schema-browser/relations-diagram.c:431
+#: ../tools/browser/schema-browser/relations-diagram.c:432
msgid "Missing table attribute in favorite's contents"
msgstr "在收藏内容中丢失表属性"
-#: ../tools/browser/schema-browser/relations-diagram.c:517
-#: ../tools/browser/schema-browser/table-info.c:976
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#: ../tools/browser/schema-browser/relations-diagram.c:517
-msgid "View contents"
-msgstr "查看内容"
-
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:314
-msgid "_Schema"
-msgstr "方案(_S)"
-
-#: ../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:315
-msgid "_New Diagram"
-msgstr "新图示(_N)"
+#: ../tools/browser/schema-browser/relations-diagram.c:531
+#, fuzzy
+#| msgid "Insert data into table"
+msgid "Manage data in selected tables"
+msgstr "向表中插入数据"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:315
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:351
msgid "Create a new diagram"
msgstr "创建一个新图示"
-#: ../tools/browser/schema-browser/schema-browser-perspective.c:419
+#: ../tools/browser/schema-browser/schema-browser-perspective.c:390
msgid "Could not load diagram"
msgstr "无法加载图示"
-#: ../tools/browser/schema-browser/table-columns.c:269
+#: ../tools/browser/schema-browser/table-columns.c:271
#, c-format
msgid "Declared foreign key '%s' on "
-msgstr "声明的外键“%s”，于"
+msgstr "声明的外键“%s”，于 "
-#: ../tools/browser/schema-browser/table-columns.c:272
+#: ../tools/browser/schema-browser/table-columns.c:274
#, c-format
msgid "Foreign key '%s' on "
-msgstr "外键“%s”，于"
+msgstr "外键“%s”，于 "
-#: ../tools/browser/schema-browser/table-columns.c:338
+#: ../tools/browser/schema-browser/table-columns.c:340
#, c-format
msgid ""
"incompatible types: '%s' for the foreign key and '%s' for the referenced "
"primary key"
msgstr "不兼容的类型：“%s”类型的外键与“%s”类型的主键"
-#: ../tools/browser/schema-browser/table-columns.c:387
+#: ../tools/browser/schema-browser/table-columns.c:389
#, 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:410
+#: ../tools/browser/schema-browser/table-columns.c:412
msgid "Unique constraint"
msgstr "惟一约束"
-#: ../tools/browser/schema-browser/table-columns.c:432
+#: ../tools/browser/schema-browser/table-columns.c:434
msgid "Tables referencing this one"
msgstr "引用此表的表"
-#: ../tools/browser/schema-browser/table-columns.c:630
+#: ../tools/browser/schema-browser/table-columns.c:632
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:652
+#: ../tools/browser/schema-browser/table-columns.c:654
msgid "Not NULL?"
msgstr "非 NULL？"
-#: ../tools/browser/schema-browser/table-columns.c:690
+#: ../tools/browser/schema-browser/table-columns.c:692
msgid "LDAP virtual table definition"
msgstr "LDAP 虚拟表定义"
-#: ../tools/browser/schema-browser/table-columns.c:737
+#: ../tools/browser/schema-browser/table-columns.c:739
msgid "Constraints and integrity rules"
msgstr "约束和完整性规则"
-#: ../tools/browser/schema-browser/table-columns.c:930
+#: ../tools/browser/schema-browser/table-columns.c:940
#, c-format
msgid "Could not find table '%s.%s'"
msgstr "找不到表“%s.%s”"
-#: ../tools/browser/schema-browser/table-columns.c:965
+#: ../tools/browser/schema-browser/table-columns.c:975
#, c-format
msgid "Could not find declared foreign key '%s'"
msgstr "找不到已声明的外键“%s”"
-#: ../tools/browser/schema-browser/table-info.c:358
+#: ../tools/browser/schema-browser/table-info.c:274
+#: ../tools/browser/schema-browser/table-info.c:750
+msgid "Meta data not yet available"
+msgstr "元数据尚不可用"
+
+#: ../tools/browser/schema-browser/table-info.c:294
+msgid "Can't find information about table"
+msgstr "找不到有关表的信息"
+
+#. To translators: "Object" is used when we can't determine if @table is a table or a view
+#: ../tools/browser/schema-browser/table-info.c:368
+#, fuzzy
+#| msgid "Objects"
+msgid "Object"
+msgstr "对象"
+
+#: ../tools/browser/schema-browser/table-info.c:408
msgid ""
"Table not found. If you think this is an error,\n"
"please refresh the meta data from the database\n"
@@ -9472,27 +10032,25 @@ msgstr ""
"没有找到表。如果您认为这是错误，请从数据库\n"
"中刷新元数据 (菜单 Connection/Fetch 元数据)"
-#: ../tools/browser/schema-browser/table-info.c:389
+#: ../tools/browser/schema-browser/table-info.c:442
msgid "Relations"
msgstr "关系"
-#: ../tools/browser/schema-browser/table-info.c:399
+#: ../tools/browser/schema-browser/table-info.c:448
msgid "Preferences"
msgstr "首选项"
-#: ../tools/browser/schema-browser/table-info.c:532
+#: ../tools/browser/schema-browser/table-info.c:584
msgid "Data successfully inserted"
msgstr "数据成功插入"
-#: ../tools/browser/schema-browser/table-info.c:663
-msgid "Meta data not yet available"
-msgstr "元数据尚不可用"
-
-#: ../tools/browser/schema-browser/table-info.c:680
-msgid "Can't find information about table"
-msgstr "找不到有关表的信息"
+#: ../tools/browser/schema-browser/table-info.c:589
+#: ../tools/browser/ui-formgrid.c:724
+#, c-format
+msgid "Error executing query: %s"
+msgstr "执行查询时出错：%s"
-#: ../tools/browser/schema-browser/table-info.c:716
+#: ../tools/browser/schema-browser/table-info.c:761
#, c-format
msgid ""
"Internal error while building INSERT statement:\n"
@@ -9501,70 +10059,66 @@ msgstr ""
"在生成 INSERT 语句时发生内部错误：\n"
"%s"
-#: ../tools/browser/schema-browser/table-info.c:762
+#: ../tools/browser/schema-browser/table-info.c:802
#, c-format
msgid "Default value: '%s'"
msgstr "默认值：“%s”"
-#: ../tools/browser/schema-browser/table-info.c:772
+#: ../tools/browser/schema-browser/table-info.c:812
msgid "Default value: auto incremented value"
msgstr "默认值：自动增加的值"
-#: ../tools/browser/schema-browser/table-info.c:883
-#: ../tools/browser/schema-browser/table-info.c:907
+#: ../tools/browser/schema-browser/table-info.c:922
+#: ../tools/browser/schema-browser/table-info.c:946
msgid "Values to insert into table"
msgstr "要插入表的值"
-#: ../tools/browser/schema-browser/table-info.c:944
+#: ../tools/browser/schema-browser/table-info.c:928
+msgid "Cancel"
+msgstr ""
+
+#: ../tools/browser/schema-browser/table-info.c:980
#, c-format
msgid "Can't find information about table '%s'"
msgstr "找不到有关表“%s”的信息"
-#: ../tools/browser/schema-browser/table-info.c:973
-msgid "_Table"
-msgstr "表(_T)"
-
-#: ../tools/browser/schema-browser/table-info.c:974
-msgid "Add table to favorites"
-msgstr "添加表到收藏"
+#: ../tools/browser/schema-browser/table-info.c:1029
+#, fuzzy
+#| msgid "Add to _Favorites"
+msgid "Add to Favorites"
+msgstr "添加到收藏(_F)"
-#: ../tools/browser/schema-browser/table-info.c:976
+#: ../tools/browser/schema-browser/table-info.c:1037
msgid "View table's contents"
msgstr "查看表的内容"
-#: ../tools/browser/schema-browser/table-info.c:978
-msgid "_Insert Data"
-msgstr "插入数据(_I)"
-
-#: ../tools/browser/schema-browser/table-info.c:978
+#: ../tools/browser/schema-browser/table-info.c:1045
msgid "Insert data into table"
msgstr "向表中插入数据"
-#: ../tools/browser/schema-browser/table-info.c:980
-msgid "_Declare Foreign Key"
+#: ../tools/browser/schema-browser/table-info.c:1053
+#, fuzzy
+#| msgid "_Declare Foreign Key"
+msgid "Declare Foreign Key"
msgstr "声明外键(_D)"
-#: ../tools/browser/schema-browser/table-info.c:980
-msgid "Declare a foreign key for table"
-msgstr "为表声明一个外键"
-
#: ../tools/browser/schema-browser/table-preferences.c:263
msgid "default"
msgstr "默认"
-#: ../tools/browser/schema-browser/table-preferences.c:340
+#: ../tools/browser/schema-browser/table-preferences.c:333
msgid "Table's fields"
msgstr "表的字段"
-#: ../tools/browser/schema-browser/table-preferences.c:384
+#: ../tools/browser/schema-browser/table-preferences.c:376
msgid "Field's display preferences"
msgstr "字段名显示首选项"
-#: ../tools/browser/schema-browser/table-preferences.c:460
+#: ../tools/browser/schema-browser/table-preferences.c:452
msgid "Data entry type:"
msgstr "数据记录类型："
-#: ../tools/browser/schema-browser/table-preferences.c:461
+#: ../tools/browser/schema-browser/table-preferences.c:453
msgid ""
"Defines how data for the selected column\n"
"will be displayed in forms. Leave 'Default' to have\n"
@@ -9573,60 +10127,114 @@ msgstr ""
"定义所选列的数据如何在表单中显示。\n"
"保留“Default”将以默认方式显示"
-#: ../tools/browser/schema-browser/table-preferences.c:470
-#: ../tools/browser/schema-browser/table-preferences.c:481
-msgid "none"
-msgstr "无"
-
-#: ../tools/browser/schema-browser/table-preferences.c:474
+#: ../tools/browser/schema-browser/table-preferences.c:463
msgid "Options:"
msgstr "选项："
-#: ../tools/browser/schema-browser/table-preferences.c:485
+#: ../tools/browser/schema-browser/table-preferences.c:471
+msgid "none"
+msgstr "无"
+
+#: ../tools/browser/schema-browser/table-preferences.c:475
msgid "Preview:"
msgstr "预览："
-#: ../tools/browser/schema-browser/table-preferences.c:486
+#: ../tools/browser/schema-browser/table-preferences.c:476
msgid ""
"Free form to test the configured\n"
"data entry"
msgstr "用来测试配置的数据记录的自由表单"
-#: ../tools/browser/support.c:194
-msgid "Information:"
-msgstr "信息："
-
-#: ../tools/browser/support.c:247
-msgid ""
-"Unable to display help. Please make sure the documentation package is "
-"installed."
-msgstr "无法显示帮助，请确认文档包已经安装。"
+#: ../tools/browser/text-search.c:265
+msgid "Hide search toolbar"
+msgstr "隐藏搜索工具栏"
-#: ../tools/browser/support.c:264
-msgid "Unable to open help file"
-msgstr "无法打开帮助文件"
+#: ../tools/browser/text-search.c:270
+msgid "Search:"
+msgstr "搜索："
-#: ../tools/browser/support.c:274 ../tools/browser/support.c:276
-msgid "Help is being loaded, please wait..."
-msgstr "正在加载帮助，请稍候..."
+#: ../tools/browser/text-search.c:290
+msgid "Case sensitive"
+msgstr "区分大小写"
-#: ../tools/browser/support.c:322
-msgid "Close tab"
-msgstr "关闭标签"
+#: ../tools/browser/ui-formgrid.c:341
+msgid "_Execute"
+msgstr "执行(_E)"
+
+#: ../tools/browser/ui-formgrid.c:349
+msgid "Enable or disable auto update of data"
+msgstr "启用或禁用自动更新数据"
+
+#: ../tools/browser/ui-formgrid.c:358
+msgid "Toggle between grid and form presentations"
+msgstr "在网格和表单表示之间切换"
-#: ../tools/browser/support.c:440
+#: ../tools/browser/ui-formgrid.c:368
+msgid "Refresh data"
+msgstr "刷新数据"
+
+#: ../tools/browser/ui-formgrid.c:469
+msgid "Execute action"
+msgstr "执行操作"
+
+#: ../tools/browser/ui-formgrid.c:517
+msgid "View LDAP entry's details"
+msgstr "查看 LDAP 记录详情"
+
+#: ../tools/browser/ui-formgrid.c:634
+#, c-format
+msgid ""
+"Set or confirm the parameters to execute\n"
+"action '%s'"
+msgstr ""
+"设置或确认要执行的参数\n"
+"操作“%s”"
+
+#: ../tools/browser/ui-formgrid.c:638
+msgid "Execution of action"
+msgstr "执行操作"
+
+#: ../tools/browser/ui-formgrid.c:715 ../tools/browser/ui-formgrid.c:719
+msgid "Action successfully executed"
+msgstr "操作成功执行"
+
+#: ../tools/browser/ui-support.c:64
msgid "Abstract"
msgstr "摘要"
-#: ../tools/browser/support.c:442
+#: ../tools/browser/ui-support.c:66
msgid "Structural"
msgstr "结构化的"
-#: ../tools/browser/support.c:444
-msgid "Auxilliary"
+#: ../tools/browser/ui-support.c:68
+#, fuzzy
+#| msgid "Auxilliary"
+msgid "Auxiliary"
msgstr "辅助的"
-#: ../tools/browser/support.h:117
+#: ../tools/browser/ui-support.c:200
+msgid "Error:"
+msgstr "错误："
+
+#: ../tools/browser/ui-support.c:242
+msgid "Information:"
+msgstr "信息："
+
+#: ../tools/browser/ui-support.c:296
+msgid ""
+"Unable to display help. Please make sure the documentation package is "
+"installed."
+msgstr "无法显示帮助，请确认文档包已经安装。"
+
+#: ../tools/browser/ui-support.c:312
+msgid "Unable to open help file"
+msgstr "无法打开帮助文件"
+
+#: ../tools/browser/ui-support.c:450
+msgid "Close tab"
+msgstr "关闭标签"
+
+#: ../tools/browser/ui-support.h:96
msgid ""
"<small>This area allows to give values to\n"
"variables defined in the SQL code\n"
@@ -9658,540 +10266,169 @@ msgstr ""
"tt> 和\n"
"<tt>binary</tt></small>"
-#: ../tools/browser/text-search.c:265
-msgid "Hide search toolbar"
-msgstr "隐藏搜索工具栏"
-
-#: ../tools/browser/text-search.c:270
-msgid "Search:"
-msgstr "搜索："
-
-#: ../tools/browser/text-search.c:290
-msgid "Case sensitive"
-msgstr "区分大小写"
-
-#: ../tools/cmdtool/tool-command.c:142 ../tools/cmdtool/tool-command.c:160
-msgid "Invalid unnamed command"
-msgstr "无效的未命名命令"
-
-#: ../tools/cmdtool/tool-command.c:282
-#, c-format
-msgid "Command '%s' not found"
-msgstr "没有找到命令“%s”"
-
-#: ../tools/cmdtool/tool-command.c:313
-#, c-format
-msgid "Syntax error after '\\'"
-msgstr "“\\”之后有语法错误"
-
-#: ../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:439
-msgid "Usage"
-msgstr "用法"
-
-#: ../tools/cmdtool/tool-input.c:478
-#, c-format
-msgid "Could not save history file to '%s': %s"
-msgstr "无法保存历史文件到 '%s'：%s"
-
-#: ../tools/cmdtool/tool-output.c:162 ../tools/gda-sql.c:1813
-#, c-format
-msgid "(%d row)"
-msgid_plural "(%d rows)"
-msgstr[0] "(%d 行)"
-
-#: ../tools/command-exec.c:246
-msgid "History is not supported"
-msgstr "不支持历史"
-
-#: ../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:2865 ../tools/gda-sql.c:3927
-#: ../tools/gda-sql.c:4804 ../tools/gda-sql.c:5529 ../tools/gda-sql.c:5748
-#: ../tools/gda-sql.c:5834
-msgid "No current connection"
-msgstr "没有当前连接"
-
-#: ../tools/command-exec.c:330
-msgid "List of tables"
-msgstr "表的列表"
-
-#: ../tools/command-exec.c:377
-msgid "List of views"
-msgstr "视图列表"
-
-#: ../tools/command-exec.c:422
-msgid "List of schemas"
-msgstr "方案列表"
-
-#: ../tools/command-exec.c:496 ../tools/command-exec.c:632
-msgid "No object found"
-msgstr "未找到对象"
-
-#: ../tools/command-exec.c:662 ../tools/web-server.c:932
-msgid "Column"
-msgstr "列"
-
-#: ../tools/command-exec.c:664 ../tools/web-server.c:934
-msgid "Nullable"
-msgstr "可以为 NULL"
-
-#: ../tools/command-exec.c:666 ../tools/web-server.c:936
-msgid "Extra"
-msgstr "额外"
-
-#: ../tools/command-exec.c:669
-#, c-format
-msgid "List of columns for view '%s'"
-msgstr "视图 '%s' 列的列表"
-
-#: ../tools/command-exec.c:673
-#, c-format
-msgid "List of columns for table '%s'"
-msgstr "表 '%s' 列的列表"
-
-#: ../tools/command-exec.c:685 ../tools/web-server.c:947
-msgid "yes"
-msgstr "是"
-
-#: ../tools/command-exec.c:685 ../tools/web-server.c:947
-msgid "no"
-msgstr "非"
-
-#: ../tools/command-exec.c:716
-#, c-format
-msgid "Could not determine columns of view '%s'"
-msgstr "无法确定视图“%s”的列数"
-
-#: ../tools/command-exec.c:720
-#, c-format
-msgid "Could not determine columns of table '%s'"
-msgstr "无法确定表格“%s”的列数"
-
-#: ../tools/command-exec.c:733
-#, c-format
-msgid "View definition: %s"
-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:893
-#, c-format
-msgid "references %s"
-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:899
-#, c-format
-msgid "references %s.%s"
-msgstr "引用了 %s.%s"
-
-#: ../tools/config-info.c:71
-msgid "Installed providers list"
-msgstr "已安装的提供者列表"
-
-#: ../tools/config-info.c:109
-#, c-format
-msgid "Could not find provider '%s'"
-msgstr "找不到提供者“%s”"
-
-#: ../tools/config-info.c:121 ../tools/config-info.c:290
-#: ../tools/gda-sql.c:5370
-msgid "Attribute"
-msgstr "属性"
-
-#: ../tools/config-info.c:124
-#, c-format
-msgid "Provider '%s' description"
-msgstr "提供者 '%s' 描述"
-
-#: ../tools/config-info.c:278
-#, c-format
-msgid "Could not find data source '%s'"
-msgstr "找不到数据源“%s”"
-
-#: ../tools/config-info.c:293
-#, c-format
-msgid "DSN '%s' description"
-msgstr "DSN '%s' 描述"
-
-#: ../tools/config-info.c:299
-msgid "DSN name"
-msgstr "DSN 名"
-
-#: ../tools/config-info.c:341
-msgid "Parameters"
-msgstr "参数"
-
-#: ../tools/config-info.c:389
-msgid "System DSN?"
-msgstr "系统 DSN？"
-
-#: ../tools/config-info.c:395
-msgid "Yes"
-msgstr "是"
-
-#: ../tools/config-info.c:395
-msgid "No"
-msgstr "无"
-
-#: ../tools/config-info.c:428
-msgid "Last used"
-msgstr "上次使用"
-
-#: ../tools/config-info.c:471
-#, c-format
-msgid "(%s)"
-msgstr "(%s)"
-
-#: ../tools/config-info.c:555
-#, c-format
-msgid "Unknown criteria '%s'"
-msgstr "未知的条件“%s”"
-
-#: ../tools/config-info.c:614
-msgid "Failed to remove: "
-msgstr "移除失败： "
-
-#: ../tools/config-info.c:643
-#, c-format
-msgid "No file to purge!"
-msgstr "没有要 purge 的文件！"
-
-#: ../tools/gda-list-server-op.c:50
-msgid "Gda server operations list"
-msgstr "Gda 操作列表"
-
-#: ../tools/gda-list-server-op.c:60
-#, c-format
-msgid "Using XML descriptions in %s\n"
-msgstr "在 %s 中使用 XML 描述\n"
-
-#: ../tools/gda-list-server-op.c:67
-#, c-format
-msgid "Could not create provider object: %s\n"
-msgstr "无法创建提供者对象：%s\n"
-
-#: ../tools/gda-list-server-op.c:76
-#, c-format
-msgid "Existing operation types for provider '%s':\n"
-msgstr "提供者 '%s' 存在的操作类型：\n"
-
-#: ../tools/gda-list-server-op.c:78
-#, c-format
-msgid "Existing operation types:\n"
-msgstr "存在的操作类型：\n"
-
-#: ../tools/gda-list-server-op.c:96
-#, c-format
-msgid "Description for type: %s\n"
-msgstr "类型的描述：%s\n"
-
-#: ../tools/gda-list-server-op.c:124
-#, c-format
-msgid "Operation not supported\n"
-msgstr "操作不支持\n"
-
-#: ../tools/gda-list-server-op.c:379
-#, c-format
-msgid "Can't parse file '%s', ignoring it"
-msgstr "无法解析文件 '%s'，忽略它"
-
-#: ../tools/gda-sql.c:196
-#, c-format
-msgid "GDA SQL console version "
-msgstr "GDA SQL 控制台版本 "
-
-#: ../tools/gda-sql.c:214
-msgid ""
-"Defines how the DN column is handled for LDAP searched (among \"dn\", \"rdn"
-"\" and \"none\")"
-msgstr "定义对搜索的 LDAP 如何处理 DN 列(从“dn”、“rdn”和“none”中选择)"
+#: ../tools/common/html-doc.c:86
+msgid "Generated by the GDA SQL console"
+msgstr "由 GDA SQL 控制台生成"
-#: ../tools/gda-sql.c:220
-msgid ""
-"Defines the LDAP attributes which are fetched by default by LDAP commands"
-msgstr "定义 LDAP 命令默认获取的 LDAP 属性"
+#: ../tools/common/html-doc.c:108
+msgid "Console"
+msgstr "控制台"
-#: ../tools/gda-sql.c:228
+#: ../tools/common/t-app.c:259
msgid "Set to TRUE when the 1st line of a CSV file holds column names"
msgstr "在 CSV 文件的第一行为列名时，设为 TRUE"
-#: ../tools/gda-sql.c:234
+#: ../tools/common/t-app.c:264
msgid "Quote character for CSV format"
msgstr "CSV 格式的引用字符"
-#: ../tools/gda-sql.c:240
+#: ../tools/common/t-app.c:269
msgid "Separator character for CSV format"
msgstr "CSV 格式的分隔字符"
-#: ../tools/gda-sql.c:352
-msgid "Welcome to the GDA SQL console, version "
-msgstr "欢迎来到 GDA SQL 控制台，版本 "
+#: ../tools/common/t-app.c:277
+msgid ""
+"Defines how the DN column is handled for LDAP searched (among \"dn\", \"rdn"
+"\" and \"none\")"
+msgstr "定义对搜索的 LDAP 如何处理 DN 列(从“dn”、“rdn”和“none”中选择)"
-#: ../tools/gda-sql.c:358
-#, c-format
+#: ../tools/common/t-app.c:282
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 (the '.' can be replaced by a '\\')\n"
-" or any SQL query terminated by a semicolon\n"
-"\n"
-msgstr ""
-"输入：%s 显示用法和颁发条款\n"
-" %s 或 %s 获取内部命令的帮助\n"
-" %s (或 CTRL-D) 退出(“.”可以用“\\”代替)\n"
-" 或任何以“;”结尾的查询语句\n"
-"\n"
+"Defines the LDAP attributes which are fetched by default by LDAP commands"
+msgstr "定义 LDAP 命令默认获取的 LDAP 属性"
-#: ../tools/gda-sql.c:413
+#: ../tools/common/t-app.c:585
#, c-format
msgid "Opening connection '%s' for: "
msgstr "打开连接“%s”，为："
-#: ../tools/gda-sql.c:429
-#, c-format
-msgid "Can't open connection %d: %s\n"
-msgstr "无法打开连接 %d：%s\n"
-
-#: ../tools/gda-sql.c:444
-#, c-format
-msgid "Opening connection '%s' (GDA_SQL_CNC environment variable): "
-msgstr "正在打开连接“%s”(GDA_SQL_CNC 环境变量)："
-
-#: ../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:471
-#, c-format
-msgid "Can't run HTTP server on port %d\n"
-msgstr "无法在端口 %d 运行 HTTP 服务\n"
-
-#: ../tools/gda-sql.c:801
-msgid "Connection closed"
-msgstr "连接已关闭"
-
-#: ../tools/gda-sql.c:896
-#, c-format
-msgid "Could not interpret the '%s' parameter's value"
-msgstr "无法解释 '%s' 参数的值"
-
-#: ../tools/gda-sql.c:913
-#, c-format
-msgid "No internal parameter named '%s' required by query"
-msgstr "没有查询所需要的名为 '%s' 的内部参数"
-
-#: ../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:1103 ../tools/gda-sql.c:1112
-#, c-format
-msgid "Can't open pipe '%s': %s"
-msgstr "无法打开管道“%s”：%s"
-
-#: ../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:1221 ../tools/gda-sql.c:3132
-#, c-format
-msgid "Connection name '%s' is invalid"
-msgstr "连接名 '%s' 无效"
-
-#: ../tools/gda-sql.c:1287
-#, c-format
-msgid "\tUsername for '%s': "
-msgstr "\t'%s' 的用户名： "
-
-#: ../tools/gda-sql.c:1294
-#, c-format
-msgid "No username for '%s'"
-msgstr "没有 '%s' 的用户名"
-
-#: ../tools/gda-sql.c:1311
-#, c-format
-msgid "\tPassword for '%s': "
-msgstr "\t'%s' 的口令： "
-
-#: ../tools/gda-sql.c:1320
-#, c-format
-msgid "No password for '%s'"
-msgstr "没有 '%s' 的口令"
-
-#: ../tools/gda-sql.c:1407
-#, 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 ""
-"此连接的数据格式会是：%s%c%s%c%s，其中 YYYY 为年份，MM 为月份，DD 为日\n"
-
-#: ../tools/gda-sql.c:1421
-#, 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:1451
-#, c-format
-msgid "Error getting meta data in background: %s\n"
-msgstr "在背景中获取元数据出错：%s\n"
-
-#: ../tools/gda-sql.c:1459 ../tools/gda-sql.c:1612
-#, c-format
-msgid ""
-"Getting database schema information for connection '%s', this may take some "
-"time... "
-msgstr "为连接 '%s' 获取数据库方案信息，这可能需要一些时间... "
-
-#: ../tools/gda-sql.c:1466 ../tools/gda-sql.c:1619 ../tools/gda-sql.c:2915
-#, c-format
-msgid "error: %s\n"
-msgstr "错误：%s\n"
-
-#: ../tools/gda-sql.c:1473 ../tools/gda-sql.c:1626 ../tools/gda-sql.c:2922
-#, c-format
-msgid "Done.\n"
-msgstr "搞定。\n"
-
-#: ../tools/gda-sql.c:2007 ../tools/gda-sql.c:2169 ../tools/gda-sql.c:2227
-#: ../tools/gda-sql.c:2235
+#: ../tools/common/t-app.c:941 ../tools/common/t-app.c:1114
+#: ../tools/common/t-app.c:1179 ../tools/common/t-app.c:1186
#, c-format
msgid "%s [<FILE>]"
msgstr "%s [<FILE>]"
-#: ../tools/gda-sql.c:2008
+#: ../tools/common/t-app.c:942
msgid "Show commands history, or save it to file"
msgstr "显示命令历史或保存到文件"
-#: ../tools/gda-sql.c:2013 ../tools/gda-sql.c:2022 ../tools/gda-sql.c:2031
-#: ../tools/gda-sql.c:2040 ../tools/gda-sql.c:2049 ../tools/gda-sql.c:2058
-#: ../tools/gda-sql.c:2067 ../tools/gda-sql.c:2076 ../tools/gda-sql.c:2085
+#: ../tools/common/t-app.c:947 ../tools/common/t-app.c:957
+#: ../tools/common/t-app.c:967 ../tools/common/t-app.c:977
+#: ../tools/common/t-app.c:987 ../tools/common/t-app.c:997
+#: ../tools/common/t-app.c:1007 ../tools/common/t-app.c:1017
+#: ../tools/common/t-app.c:1025
msgid "Information"
msgstr "信息"
-#: ../tools/gda-sql.c:2015
+#: ../tools/common/t-app.c:948
#, c-format
msgid "%s [<META DATA TYPE>]"
msgstr "%s [<META DATA TYPE>]"
-#: ../tools/gda-sql.c:2016
+#: ../tools/common/t-app.c:949
msgid ""
"Force reading the database meta data (or part of the meta data, ex:\"tables"
"\")"
msgstr "强制读取数据库元数据 (或部分元数据，例如“tables”)"
-#: ../tools/gda-sql.c:2024
+#: ../tools/common/t-app.c:958
#, c-format
msgid "%s <fkname> <tableA>(<colA>,...) <tableB>(<colB>,...)"
msgstr "%s <fkname> <tableA>(<colA>,...) <tableB>(<colB>,...)"
-#: ../tools/gda-sql.c:2025
+#: ../tools/common/t-app.c:959
msgid ""
"Declare a new foreign key (not actually in database): tableA references "
"tableB"
msgstr "声明一个新外键(实际不在数据库中)：tableA 引用 tableB"
-#: ../tools/gda-sql.c:2033
+#: ../tools/common/t-app.c:968
#, c-format
msgid "%s <fkname> <tableA> <tableB>"
msgstr "%s <fkname> <tableA> <tableB>"
-#: ../tools/gda-sql.c:2034
+#: ../tools/common/t-app.c:969
msgid "Un-declare a foreign key (not actually in database)"
msgstr "解除声明一个外键(实际不在数据库中)"
-#: ../tools/gda-sql.c:2042
+#: ../tools/common/t-app.c:978
#, c-format
msgid "%s [<TABLE>]"
msgstr "%s [<TABLE>]"
-#: ../tools/gda-sql.c:2043
+#: ../tools/common/t-app.c:979
msgid "List all tables (or named table)"
msgstr "列出所有表 (或有名表)"
-#: ../tools/gda-sql.c:2051
+#: ../tools/common/t-app.c:988
#, c-format
msgid "%s [<VIEW>]"
msgstr "%s [<VIEW>]"
-#: ../tools/gda-sql.c:2052
+#: ../tools/common/t-app.c:989
msgid "List all views (or named view)"
msgstr "列出所有视图 (或有名视图)"
-#: ../tools/gda-sql.c:2060
+#: ../tools/common/t-app.c:998
#, c-format
msgid "%s [<SCHEMA>]"
msgstr "%s [<SCHEMA>]"
-#: ../tools/gda-sql.c:2061
+#: ../tools/common/t-app.c:999
msgid "List all schemas (or named schema)"
msgstr "列出所有方案 (或命名方案)"
-#: ../tools/gda-sql.c:2069
+#: ../tools/common/t-app.c:1008
#, c-format
msgid "%s [<OBJ_NAME>|<SCHEMA>.*]"
msgstr "%s [<OBJ_NAME>|<SCHEMA>.*]"
-#: ../tools/gda-sql.c:2070
+#: ../tools/common/t-app.c:1009
msgid "Describe object or full list of objects"
msgstr "描述对象或对象的完整列表"
-#: ../tools/gda-sql.c:2078
+#: ../tools/common/t-app.c:1018
#, c-format
msgid "%s [<TABLE1> [<TABLE2>...]]"
msgstr "%s [<TABLE1> [<TABLE2>...]]"
-#: ../tools/gda-sql.c:2079
+#: ../tools/common/t-app.c:1019
msgid "Create a graph of all or the listed tables"
msgstr "创建一张对应所有或列出的表的图"
-#: ../tools/gda-sql.c:2087
+#: ../tools/common/t-app.c:1026
#, c-format
msgid "%s [<port> [<authentication token>]]"
msgstr "%s [<port> [<authentication token>]]"
-#: ../tools/gda-sql.c:2088
+#: ../tools/common/t-app.c:1027
msgid "Start/stop embedded HTTP server (on given port or on 12345 by default)"
msgstr "启动/停止 嵌入的 HTTP 服务器 (在给定的端口上或默认的 12345 端口)"
-#: ../tools/gda-sql.c:2097
+#: ../tools/common/t-app.c:1035
#, c-format
msgid "%s [[<CNC_NAME>] [<DSN>|<CONNECTION STRING>]]"
msgstr "%s [[<CNC_NAME>] [<DSN>|<CONNECTION STRING>]]"
-#: ../tools/gda-sql.c:2098
+#: ../tools/common/t-app.c:1036
msgid "Opens a new connection or lists opened connections"
msgstr "打开新连接或列出打开的连接"
-#: ../tools/gda-sql.c:2107
+#: ../tools/common/t-app.c:1047
#, c-format
msgid "%s [<CNC_NAME>]"
msgstr "%s [<CNC_NAME>]"
-#: ../tools/gda-sql.c:2108
+#: ../tools/common/t-app.c:1048
msgid "Close a connection"
msgstr "关闭连接"
-#: ../tools/gda-sql.c:2116
+#: ../tools/common/t-app.c:1057
#, c-format
msgid "%s <CNC NAME> <OBJ NAME> [<OBJ NAME> ...]"
msgstr "%s <CNC NAME> <OBJ NAME> [<OBJ NAME> ...]"
-#: ../tools/gda-sql.c:2117
+#: ../tools/common/t-app.c:1058
msgid ""
"Bind connections or datasets (<OBJ NAME>) into a single new one (allowing "
"SQL commands to be executed across multiple connections and/or datasets)"
@@ -10199,211 +10436,224 @@ msgstr ""
"将连接或数据集(<OBJ NAME>)绑定为单个的新连接或数据集(以允许在多个连接和/或数"
"据集上执行 SQL 命令)"
-#: ../tools/gda-sql.c:2123 ../tools/gda-sql.c:2132 ../tools/gda-sql.c:2141
-#: ../tools/gda-sql.c:2150
+#: ../tools/common/t-app.c:1066 ../tools/common/t-app.c:1076
+#: ../tools/common/t-app.c:1086 ../tools/common/t-app.c:1096
msgid "DSN (data sources) management"
msgstr "DSN (数据源) 管理"
-#: ../tools/gda-sql.c:2125
+#: ../tools/common/t-app.c:1067
#, c-format
msgid "%s [<DSN>]"
msgstr "%s [<DSN>]"
-#: ../tools/gda-sql.c:2126
-msgid "List all DSN (or named DSN's attributes)"
+#: ../tools/common/t-app.c:1068
+#, fuzzy
+#| msgid "List all DSN (or named DSN's attributes)"
+msgid "List all DSN (or specified DSN's attributes)"
msgstr "列出所有 DSN (或命名 DSN 属性)"
-#: ../tools/gda-sql.c:2134
+#: ../tools/common/t-app.c:1077
#, c-format
msgid "%s <DSN_NAME> <DSN_DEFINITION> [<DESCRIPTION>]"
msgstr "%s <DSN_NAME> <DSN_DEFINITION> [<DESCRIPTION>]"
-#: ../tools/gda-sql.c:2135
+#: ../tools/common/t-app.c:1078
msgid "Create (or modify) a DSN"
msgstr "创建 (或修改) DSN"
-#: ../tools/gda-sql.c:2143
+#: ../tools/common/t-app.c:1087
#, c-format
msgid "%s <DSN_NAME> [<DSN_NAME>...]"
msgstr "%s <DSN_NAME> [<DSN_NAME>...]"
-#: ../tools/gda-sql.c:2144
+#: ../tools/common/t-app.c:1088
msgid "Remove a DSN"
msgstr "移除一个 DSN"
-#: ../tools/gda-sql.c:2152
+#: ../tools/common/t-app.c:1097
#, c-format
msgid "%s [<PROVIDER>]"
msgstr "%s [<PROVIDER>]"
-#: ../tools/gda-sql.c:2153
+#: ../tools/common/t-app.c:1098
msgid "List all installed database providers (or named one's attributes)"
msgstr "列出所有已安装的数据库提供者 (或命令提供者的属性)"
-#: ../tools/gda-sql.c:2159 ../tools/gda-sql.c:2167 ../tools/gda-sql.c:2175
-#: ../tools/gda-sql.c:2183 ../tools/gda-sql.c:2297
+#: ../tools/common/t-app.c:1106 ../tools/common/t-app.c:1113
+#: ../tools/common/t-app.c:1120 ../tools/common/t-app.c:1127
+#: ../tools/common/t-app.c:1241
msgid "Input/Output"
msgstr "输入/输出"
-#: ../tools/gda-sql.c:2161 ../tools/gda-sql.c:2259
+#: ../tools/common/t-app.c:1107 ../tools/common/t-app.c:1207
#, c-format
msgid "%s <FILE>"
msgstr "%s <FILE>"
-#: ../tools/gda-sql.c:2162
+#: ../tools/common/t-app.c:1108
msgid "Execute commands from file"
msgstr "从文件执行命令"
-#: ../tools/gda-sql.c:2170
+#: ../tools/common/t-app.c:1115
msgid "Send output to a file or |pipe"
msgstr "发送输出到一个文件或 |管道"
-#: ../tools/gda-sql.c:2177 ../tools/gda-sql.c:2185
+#: ../tools/common/t-app.c:1121 ../tools/common/t-app.c:1128
#, c-format
msgid "%s [<TEXT>]"
msgstr "%s [<TEXT>]"
-#: ../tools/gda-sql.c:2178
+#: ../tools/common/t-app.c:1122
msgid "Print TEXT or an empty line to standard output"
msgstr "将 TEXT 或一个空行打印到标准输入"
-#: ../tools/gda-sql.c:2186
+#: ../tools/common/t-app.c:1129
msgid "Send TEXT or an empty line to current output stream"
msgstr "将 TEXT 或一个空行发送到当前输入流"
-#: ../tools/gda-sql.c:2201
+#: ../tools/common/t-app.c:1142
#, c-format
msgid "%s [<DIR>]"
msgstr "%s [<DIR>]"
-#: ../tools/gda-sql.c:2202
+#: ../tools/common/t-app.c:1143
msgid "Change the current working directory"
msgstr "更改当前工作目录"
-#: ../tools/gda-sql.c:2210
+#: ../tools/common/t-app.c:1150
msgid "Show usage and distribution terms"
msgstr "显示使用方法和发行条款"
-#: ../tools/gda-sql.c:2218
+#: ../tools/common/t-app.c:1159
#, c-format
msgid "%s [<NAME> [<VALUE>]]"
msgstr "%s [<NAME> [<VALUE>]]"
-#: ../tools/gda-sql.c:2219
+#: ../tools/common/t-app.c:1160
msgid "Set or show an option, or list all options "
msgstr "设置或显示一个选项，或列出所有选项 "
-#: ../tools/gda-sql.c:2225 ../tools/gda-sql.c:2233 ../tools/gda-sql.c:2241
-#: ../tools/gda-sql.c:2249 ../tools/gda-sql.c:2257 ../tools/gda-sql.c:2265
-#: ../tools/gda-sql.c:2273 ../tools/gda-sql.c:2281 ../tools/gda-sql.c:2289
-#: ../tools/gda-sql.c:2315
+#: ../tools/common/t-app.c:1169 ../tools/common/t-app.c:1266
+#, c-format
+msgid "%s [<NAME>]"
+msgstr "%s [<NAME>]"
+
+#: ../tools/common/t-app.c:1170
+#, fuzzy
+#| msgid ""
+#| "Can't get the list of files used to store information about each "
+#| "connection: %s\n"
+msgid "Show a piece of information, or all information about the connection"
+msgstr "无法获取用来保存各连接相关信息的文件的列表：%s\n"
+
+#: ../tools/common/t-app.c:1178 ../tools/common/t-app.c:1185
+#: ../tools/common/t-app.c:1192 ../tools/common/t-app.c:1199
+#: ../tools/common/t-app.c:1206 ../tools/common/t-app.c:1213
+#: ../tools/common/t-app.c:1220 ../tools/common/t-app.c:1227
+#: ../tools/common/t-app.c:1234 ../tools/common/t-app.c:1248
msgid "Query buffer & query favorites"
msgstr "查询缓冲区及查询收藏"
-#: ../tools/gda-sql.c:2228
+#: ../tools/common/t-app.c:1180
msgid "Edit the query buffer (or file) with external editor"
msgstr "使用外部编辑器编辑查询缓存(或文件)"
-#: ../tools/gda-sql.c:2236
+#: ../tools/common/t-app.c:1187
msgid "Reset the query buffer (or load file into query buffer)"
msgstr "重置查询缓冲区(或将文件加载到缓冲区)"
-#: ../tools/gda-sql.c:2244
+#: ../tools/common/t-app.c:1194
msgid "Show the contents of the query buffer"
msgstr "显示查询缓存的内容"
-#: ../tools/gda-sql.c:2251
+#: ../tools/common/t-app.c:1200
#, c-format
msgid "%s [<FAVORITE_NAME>]"
msgstr "%s [<FAVORITE_NAME>]"
-#: ../tools/gda-sql.c:2252
+#: ../tools/common/t-app.c:1201
msgid "Execute contents of query buffer, or execute specified query favorite"
msgstr "执行查询缓冲区的内容，或执行指定的查询收藏"
-#: ../tools/gda-sql.c:2260
+#: ../tools/common/t-app.c:1208
msgid "Write query buffer to file"
msgstr "将查询缓存写入文件"
-#: ../tools/gda-sql.c:2267 ../tools/gda-sql.c:2275 ../tools/gda-sql.c:2283
+#: ../tools/common/t-app.c:1214 ../tools/common/t-app.c:1221
+#: ../tools/common/t-app.c:1228
#, c-format
msgid "%s <FAVORITE_NAME>"
msgstr "%s <FAVORITE_NAME>"
-#: ../tools/gda-sql.c:2268
+#: ../tools/common/t-app.c:1215
msgid "Save query buffer as favorite"
msgstr "将查询缓冲区保存为收藏"
-#: ../tools/gda-sql.c:2276
+#: ../tools/common/t-app.c:1222
msgid "Load a query favorite into query buffer"
msgstr "将一条查询收藏加载到查询缓冲区"
-#: ../tools/gda-sql.c:2284
+#: ../tools/common/t-app.c:1229
msgid "Delete a query favorite"
msgstr "删除一条查询收藏"
-#: ../tools/gda-sql.c:2291 ../tools/gda-sql.c:2360
+#: ../tools/common/t-app.c:1235 ../tools/common/t-app.c:1292
#, c-format
msgid "%s"
msgstr "%s"
-#: ../tools/gda-sql.c:2292
+#: ../tools/common/t-app.c:1236
msgid "List all query favorites"
msgstr "列出所有查询收藏"
-#: ../tools/gda-sql.c:2300
+#: ../tools/common/t-app.c:1243
msgid "Set output format"
msgstr "设置输出格式"
-#: ../tools/gda-sql.c:2317
+#: ../tools/common/t-app.c:1249
#, c-format
msgid "%s [<NAME>|<TABLE> <COLUMN> <ROW_CONDITION>] <FILE>"
msgstr "%s [<NAME>|<TABLE> <COLUMN> <ROW_CONDITION>] <FILE>"
-#: ../tools/gda-sql.c:2318
+#: ../tools/common/t-app.c:1250
msgid "Export internal parameter or table's value to the FILE file"
msgstr "导出内部参数或表的值到 FILE 文件"
-#: ../tools/gda-sql.c:2323 ../tools/gda-sql.c:2332 ../tools/gda-sql.c:2341
-#: ../tools/gda-sql.c:2349
+#: ../tools/common/t-app.c:1255 ../tools/common/t-app.c:1265
+#: ../tools/common/t-app.c:1275 ../tools/common/t-app.c:1282
msgid "Execution context"
msgstr "执行上下文(context)"
-#: ../tools/gda-sql.c:2325
+#: ../tools/common/t-app.c:1256
#, c-format
msgid "%s [<NAME> [<VALUE>|_null_]]"
msgstr "%s [<NAME> [<VALUE>|_null_]]"
-#: ../tools/gda-sql.c:2326
+#: ../tools/common/t-app.c:1257
msgid "Set or show internal parameter, or list all if no parameter specified "
msgstr "设置或显示内部参数，再或者在没有指定参数时列出所有 "
-#: ../tools/gda-sql.c:2334
-#, c-format
-msgid "%s [<NAME>]"
-msgstr "%s [<NAME>]"
-
-#: ../tools/gda-sql.c:2335
+#: ../tools/common/t-app.c:1267
msgid "Unset (delete) internal named parameter (or all parameters)"
msgstr "取消设置(删除)内部命名参数 (或所有参数)"
-#: ../tools/gda-sql.c:2343
+#: ../tools/common/t-app.c:1276
#, c-format
msgid "%s <NAME> [<FILE>|<TABLE> <COLUMN> <ROW_CONDITION>]"
msgstr "%s <NAME> [<FILE>|<TABLE> <COLUMN> <ROW_CONDITION>]"
-#: ../tools/gda-sql.c:2344
+#: ../tools/common/t-app.c:1277
msgid ""
"Set internal parameter as the contents of the FILE file or from an existing "
"table's value"
msgstr "将内部参数设为 FILE 文件的内容或取自现在表的值"
-#: ../tools/gda-sql.c:2351
+#: ../tools/common/t-app.c:1283
#, c-format
msgid "%s <SELECT> <ROW_FIELDS> [<COLUMN_FIELDS> [<DATA_FIELDS> ...]]"
msgstr "%s <SELECT> <ROW_FIELDS> [<COLUMN_FIELDS> [<DATA_FIELDS> ...]]"
-#: ../tools/gda-sql.c:2352
+#: ../tools/common/t-app.c:1284
msgid ""
"Performs a statistical analysis on the data from SELECT, using ROW_FIELDS "
"and COLUMN_FIELDS criteria and optionally DATA_FIELDS for the data"
@@ -10411,585 +10661,1431 @@ msgstr ""
"对 SELECT 的数据执行统计分析，使用数据的 ROW_FIELDS、COLUMN_FIELDS 及可选的 "
"DATA_FIELDS 作为条件"
-#: ../tools/gda-sql.c:2358 ../tools/gda-sql.c:2367 ../tools/gda-sql.c:2376
-#: ../tools/gda-sql.c:2385 ../tools/gda-sql.c:2394 ../tools/gda-sql.c:2403
+#: ../tools/common/t-app.c:1290 ../tools/common/t-app.c:1301
+#: ../tools/common/t-app.c:1312 ../tools/common/t-app.c:1323
+#: ../tools/common/t-app.c:1334 ../tools/common/t-app.c:1345
msgid "Datasets' manipulations"
msgstr "数据集操作"
-#: ../tools/gda-sql.c:2361
+#: ../tools/common/t-app.c:1293
msgid "Lists all the datasets kept in memory for reference"
msgstr "列出内存中保持的所有数据作为参考"
-#: ../tools/gda-sql.c:2369
+#: ../tools/common/t-app.c:1303
#, c-format
msgid "%s <DATASET NAME> <PATTERN>"
msgstr "%s <DATASET NAME> <PATTERN>"
-#: ../tools/gda-sql.c:2370
+#: ../tools/common/t-app.c:1304
msgid "Show a dataset's contents where lines match a regular expression"
msgstr "显示数据集内容中匹配正则表达式的那些行"
-#: ../tools/gda-sql.c:2378
+#: ../tools/common/t-app.c:1314
#, c-format
msgid "%s <DATASET NAME> [<COLUMN> [<COLUMN> ...]]"
msgstr "%s <DATASET NAME> [<COLUMN> [<COLUMN> ...]]"
-#: ../tools/gda-sql.c:2379
+#: ../tools/common/t-app.c:1315
msgid ""
"Show a dataset's contents, showing only the specified columns if any "
"specified"
msgstr "显示数据集的内容，(若指定列)只显示指定的列"
-#: ../tools/gda-sql.c:2387
+#: ../tools/common/t-app.c:1325
#, c-format
msgid "%s <DATASET NAME> [<DATASET NAME> ...]"
msgstr "%s <DATASET NAME> [<DATASET NAME> ...]"
-#: ../tools/gda-sql.c:2388
+#: ../tools/common/t-app.c:1326
msgid "Remove one or more datasets"
msgstr "移除一个或多个数据集"
-#: ../tools/gda-sql.c:2396
-#, c-format
-msgid "%s <DATASET NAME> <DATASET NAME>"
-msgstr "%s <DATASET NAME> <DATASET NAME>"
+#: ../tools/common/t-app.c:1336
+#, c-format
+msgid "%s <DATASET NAME> <DATASET NAME>"
+msgstr "%s <DATASET NAME> <DATASET NAME>"
+
+#: ../tools/common/t-app.c:1337
+msgid "Rename a dataset, useful to rename the '_' dataset to keep it"
+msgstr "重命名一个数据集，可用于将“_”数据集改名以保留它"
+
+#: ../tools/common/t-app.c:1347
+#, c-format
+msgid "%s CSV <FILE NAME>"
+msgstr "%s CSV <FILE NAME>"
+
+#: ../tools/common/t-app.c:1348
+msgid "Import a dataset from a file"
+msgstr "从文件导入数据集"
+
+#: ../tools/common/t-app.c:1357 ../tools/common/t-app.c:1365
+#: ../tools/common/t-app.c:1377 ../tools/common/t-app.c:1385
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../tools/common/t-app.c:1359
+#, c-format
+msgid "%s <filter> [<base|onelevel|subtree> [<base DN>]]"
+msgstr "%s <filter> [<base|onelevel|subtree> [<base DN>]]"
+
+#: ../tools/common/t-app.c:1360
+msgid "Search LDAP entries"
+msgstr "搜索 LDAP 记录"
+
+#: ../tools/common/t-app.c:1367
+#, c-format
+msgid "%s <DN> [\"all\"|\"set\"|\"unset\"]"
+msgstr "%s <DN> [\"all\"|\"set\"|\"unset\"]"
+
+#: ../tools/common/t-app.c:1368
+#, fuzzy
+#| 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 "
+#| "parameter is passed, then the unset attributes are also shown, and if the "
+#| "\"unset\" 2nd parameter is passed, then only non set attributes are shown."
+msgid ""
+"Shows attributes for the entry identified by its DN. If the \"set\" 2nd "
+"parameter is passed, then all set attributes are shown, if the \"all\" 2nd "
+"parameter is passed, then the unset attributes are also shown, and if the "
+"\"unset\" 2nd parameter is passed, then only non set attributes are shown."
+msgstr ""
+"显示以 DN 标识的记录的属性。如果传递了第二个参数“set”，则显示所有已设属性；如"
+"果传递了第二个参数“all”，则未设置属性也将显示；如果传递了第二个参数“unset”，"
+"则只显示未设属性。"
+
+#: ../tools/common/t-app.c:1379
+#, c-format
+msgid "%s <DN> <new DN>"
+msgstr "%s <DN> <new DN>"
+
+#: ../tools/common/t-app.c:1380
+msgid "Renames an LDAP entry"
+msgstr "重命名一条 LDAP 记录"
+
+#: ../tools/common/t-app.c:1387
+#, c-format
+msgid "%s <DN> <OPERATION> [<ATTR>[=<VALUE>]] [<ATTR>=<VALUE> ...]"
+msgstr "%s <DN> <OPERATION> [<ATTR>[=<VALUE>]] [<ATTR>=<VALUE> ...]"
+
+#: ../tools/common/t-app.c:1388
+msgid ""
+"Modifies an LDAP entry's attributes; <OPERATION> may be DELETE, REPLACE or "
+"ADD"
+msgstr "修改一条 LDAP 记录的属性；<OPERATION> 可以是 DELETE、REPLACE 或 ADD"
+
+#: ../tools/common/t-app.c:1425
+msgid "History is not supported"
+msgstr "不支持历史"
+
+#: ../tools/common/t-app.c:1443 ../tools/common/t-app.c:1484
+#: ../tools/common/t-app.c:1534 ../tools/common/t-app.c:1583
+#: ../tools/common/t-app.c:1707 ../tools/common/t-app.c:2789
+#: ../tools/common/t-app.c:3657 ../tools/common/t-app.c:4292
+#: ../tools/common/t-app.c:4460 ../tools/common/t-app.c:4579
+msgid "No current connection"
+msgstr "没有当前连接"
+
+#: ../tools/common/t-app.c:1513
+msgid "List of tables"
+msgstr "表的列表"
+
+#: ../tools/common/t-app.c:1562
+msgid "List of views"
+msgstr "视图列表"
+
+#: ../tools/common/t-app.c:1609
+msgid "List of schemas"
+msgstr "方案列表"
+
+#: ../tools/common/t-app.c:1683 ../tools/common/t-app.c:1806
+msgid "No object found"
+msgstr "未找到对象"
+
+#: ../tools/common/t-app.c:1836 ../tools/common/web-server.c:849
+msgid "Column"
+msgstr "列"
+
+#: ../tools/common/t-app.c:1838 ../tools/common/web-server.c:851
+msgid "Nullable"
+msgstr "可以为 NULL"
+
+#: ../tools/common/t-app.c:1840 ../tools/common/web-server.c:853
+msgid "Extra"
+msgstr "额外"
+
+#: ../tools/common/t-app.c:1843
+#, c-format
+msgid "List of columns for view '%s'"
+msgstr "视图 '%s' 列的列表"
+
+#: ../tools/common/t-app.c:1847
+#, c-format
+msgid "List of columns for table '%s'"
+msgstr "表 '%s' 列的列表"
+
+#: ../tools/common/t-app.c:1858 ../tools/common/web-server.c:863
+msgid "yes"
+msgstr "是"
-#: ../tools/gda-sql.c:2397
-msgid "Rename a dataset, useful to rename the '_' dataset to keep it"
-msgstr "重命名一个数据集，可用于将“_”数据集改名以保留它"
+#: ../tools/common/t-app.c:1858 ../tools/common/web-server.c:863
+msgid "no"
+msgstr "非"
-#: ../tools/gda-sql.c:2405
+#: ../tools/common/t-app.c:1886
#, c-format
-msgid "%s CSV <FILE NAME>"
-msgstr "%s CSV <FILE NAME>"
+msgid "Could not determine columns of view '%s'"
+msgstr "无法确定视图“%s”的列数"
-#: ../tools/gda-sql.c:2406
-msgid "Import a dataset from a file"
-msgstr "从文件导入数据集"
+#: ../tools/common/t-app.c:1890
+#, c-format
+msgid "Could not determine columns of table '%s'"
+msgstr "无法确定表格“%s”的列数"
-#: ../tools/gda-sql.c:2415
+#: ../tools/common/t-app.c:1903
#, c-format
-msgid "%s <filter> [<base|onelevel|subtree> [<base DN>]]"
-msgstr "%s <filter> [<base|onelevel|subtree> [<base DN>]]"
+msgid "View definition: %s"
+msgstr "视图定义：%s"
-#: ../tools/gda-sql.c:2416
-msgid "Search LDAP entries"
-msgstr "搜索 LDAP 记录"
+#. To translators: the term "references" is the verb
+#. * "to reference" in the context of foreign keys where
+#. * "table A REFERENCES table B"
+#: ../tools/common/t-app.c:2063
+#, c-format
+msgid "references %s"
+msgstr "引用了 %s"
-#: ../tools/gda-sql.c:2423
+#. To translators: the term "references" is the verb
+#. * "to reference" in the context of foreign keys where
+#. * "table A REFERENCES table B"
+#: ../tools/common/t-app.c:2069
#, c-format
-msgid "%s <DN> [\"all\"|\"set\"|\"unset\"]"
-msgstr "%s <DN> [\"all\"|\"set\"|\"unset\"]"
+msgid "references %s.%s"
+msgstr "引用了 %s.%s"
-#: ../tools/gda-sql.c:2424
-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 "
-"parameter is passed, then the unset attributes are also shown, and if the "
-"\"unset\" 2nd parameter is passed, then only non set attributes are shown."
-msgstr ""
-"显示以 DN 标识的记录的属性。如果传递了第二个参数“set”，则显示所有已设属性；如"
-"果传递了第二个参数“all”，则未设置属性也将显示；如果传递了第二个参数“unset”，"
-"则只显示未设属性。"
+#: ../tools/common/t-app.c:2152
+#, c-format
+msgid "Unknown output format: '%s', reset to default"
+msgstr "位置输出格式：'%s'，重置为默认"
-#: ../tools/gda-sql.c:2435
+#: ../tools/common/t-app.c:2246 ../tools/common/t-app.c:2317
#, c-format
-msgid "%s <DN> <new DN>"
-msgstr "%s <DN> <new DN>"
+msgid "No option named '%s'"
+msgstr "没有名为“%s”的选项"
-#: ../tools/gda-sql.c:2436
-msgid "Renames an LDAP entry"
-msgstr "重命名一条 LDAP 记录"
+#: ../tools/common/t-app.c:2258
+msgid "List of options"
+msgstr "选项列表"
-#: ../tools/gda-sql.c:2443
+#: ../tools/common/t-app.c:2329
+msgid "Current connection's information"
+msgstr "当前连接的信息"
+
+#: ../tools/common/t-app.c:2408
#, c-format
-msgid "%s <DN> <OPERATION> [<ATTR>[=<VALUE>]] [<ATTR>=<VALUE> ...]"
-msgstr "%s <DN> <OPERATION> [<ATTR>[=<VALUE>]] [<ATTR>=<VALUE> ...]"
+msgid "Could not get home directory: %s"
+msgstr "无法获得主目录：%s"
-#: ../tools/gda-sql.c:2444
-msgid ""
-"Modifies an LDAP entry's attributes; <OPERATION> may be DELETE, REPLACE or "
-"ADD"
-msgstr "修改一条 LDAP 记录的属性；<OPERATION> 可以是 DELETE、REPLACE 或 ADD"
+#: ../tools/common/t-app.c:2434
+#, c-format
+msgid "Working directory is now: %s"
+msgstr "工作目录现在为：%s"
-#: ../tools/gda-sql.c:2490
+#: ../tools/common/t-app.c:2439
#, c-format
-msgid "Unknown output format: '%s', reset to default"
-msgstr "位置输出格式：'%s'，重置为默认"
+msgid "Could not change working directory to '%s': %s"
+msgstr "无法更改工作目录到 '%s'：%s"
-#: ../tools/gda-sql.c:2635
+#: ../tools/common/t-app.c:2535
msgid "DSN list"
msgstr "DSN 列表"
-#: ../tools/gda-sql.c:2688 ../tools/gda-sql.c:5857
+#: ../tools/common/t-app.c:2590
msgid "Missing arguments"
msgstr "丢失参数"
-#: ../tools/gda-sql.c:2709
+#: ../tools/common/t-app.c:2626
msgid "Missing provider name"
msgstr "丢失提供者名"
-#: ../tools/gda-sql.c:2733
+#: ../tools/common/t-app.c:2652
msgid "Missing DSN name"
msgstr "丢失 DSN 名"
-#: ../tools/gda-sql.c:2909
+#: ../tools/common/t-app.c:2830
#, c-format
msgid "Getting database schema information, this may take some time... "
msgstr "正在获取数据库方案信息，这可能需要一些时间... "
-#: ../tools/gda-sql.c:2942 ../tools/gda-sql.c:3127
+#: ../tools/common/t-app.c:2837
+#, c-format
+msgid "error: %s\n"
+msgstr "错误：%s\n"
+
+#: ../tools/common/t-app.c:2844
+#, c-format
+msgid "Done.\n"
+msgstr "搞定。\n"
+
+#: ../tools/common/t-app.c:2864 ../tools/common/t-app.c:3026
#, c-format
msgid "A connection named '%s' already exists"
msgstr "名为 '%s' 的连接已经存在"
-#: ../tools/gda-sql.c:2968
+#: ../tools/common/t-app.c:2892
msgid "No opened connection"
msgstr "无已经打开的连接"
-#: ../tools/gda-sql.c:2979
+#: ../tools/common/t-app.c:2903
msgid "DSN or connection string"
msgstr "DSN 或连接字符串"
-#: ../tools/gda-sql.c:3119
+#: ../tools/common/t-app.c:3018
msgid "Missing required connection names"
msgstr "丢失必须的连接名"
-#: ../tools/gda-sql.c:3142
+#: ../tools/common/t-app.c:3031 ../tools/common/t-connection.c:730
+#, c-format
+msgid "Connection name '%s' is invalid"
+msgstr "连接名 '%s' 无效"
+
+#: ../tools/common/t-app.c:3041
#, 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:3163
-msgid "Bound connections are as:"
-msgstr "绑定连接的形式为："
+#: ../tools/common/t-app.c:3062
+msgid "Connections were bound 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:3176
+#: ../tools/common/t-app.c:3075
#, c-format
msgid "%s in the '%s' namespace"
msgstr "“%2$s 命名空间中的 %1$s"
#. 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:3190
+#: ../tools/common/t-app.c:3089
#, c-format
msgid "%s mapped to the %s table"
msgstr "映射到 %2$s 表的 %1$s"
-#: ../tools/gda-sql.c:3265
-#, c-format
-msgid "No option named '%s'"
-msgstr "没有名为“%s”的选项"
-
-#: ../tools/gda-sql.c:3277
-msgid "List of options"
-msgstr "选项列表"
-
-#: ../tools/gda-sql.c:3343
-#, c-format
-msgid "Could not get home directory: %s"
-msgstr "无法获得主目录：%s"
-
-#: ../tools/gda-sql.c:3369
-#, c-format
-msgid "Working directory is now: %s"
-msgstr "工作目录现在为：%s"
-
-#: ../tools/gda-sql.c:3374
-#, c-format
-msgid "Could not change working directory to '%s': %s"
-msgstr "无法更改工作目录到 '%s'：%s"
-
-#: ../tools/gda-sql.c:3393 ../tools/gda-sql.c:3488 ../tools/gda-sql.c:3524
-#: ../tools/gda-sql.c:3546 ../tools/gda-sql.c:3581 ../tools/gda-sql.c:3618
-#: ../tools/gda-sql.c:3720 ../tools/gda-sql.c:3777 ../tools/gda-sql.c:3856
-#: ../tools/gda-sql.c:4576 ../tools/gda-sql.c:4663
+#: ../tools/common/t-app.c:3122 ../tools/common/t-app.c:3225
+#: ../tools/common/t-app.c:3259 ../tools/common/t-app.c:3282
+#: ../tools/common/t-app.c:3320 ../tools/common/t-app.c:3359
+#: ../tools/common/t-app.c:3460 ../tools/common/t-app.c:3513
+#: ../tools/common/t-app.c:3589 ../tools/common/t-app.c:5016
+#: ../tools/common/t-app.c:5105
msgid "No connection opened"
msgstr "没有打开的连接"
-#: ../tools/gda-sql.c:3411
+#: ../tools/common/t-app.c:3142
#, c-format
msgid "Could not write to temporary file '%s': %s"
msgstr "无法写入临时文件 '%s'：%s"
-#: ../tools/gda-sql.c:3447
+#: ../tools/common/t-app.c:3179
#, c-format
msgid "could not start editor '%s'"
msgstr "无法启动编辑器 '%s'"
-#: ../tools/gda-sql.c:3452
+#: ../tools/common/t-app.c:3184
msgid "Could not start /bin/sh"
msgstr "无法启动 /bin/sh"
-#: ../tools/gda-sql.c:3589
+#: ../tools/common/t-app.c:3326
msgid "Missing FILE to write to"
msgstr "丢失要写入的 FILE"
-#: ../tools/gda-sql.c:3624
+#: ../tools/common/t-app.c:3365
msgid "Favorite name"
msgstr "收藏的名称"
-#: ../tools/gda-sql.c:3625
+#: ../tools/common/t-app.c:3366
msgid "Comments"
msgstr "注释"
-#: ../tools/gda-sql.c:3626
+#: ../tools/common/t-app.c:3367
msgid "SQL"
msgstr "SQL"
-#: ../tools/gda-sql.c:3734 ../tools/gda-sql.c:3842 ../tools/gda-sql.c:3910
+#: ../tools/common/t-app.c:3473 ../tools/common/t-app.c:3573
+#: ../tools/common/t-app.c:3638
msgid "Missing query buffer name"
msgstr "丢失查询缓存名"
-#: ../tools/gda-sql.c:3763
+#: ../tools/common/t-app.c:3497
msgid "Query buffer is empty"
msgstr "查询缓存是空的"
-#: ../tools/gda-sql.c:3810 ../tools/tools-favorites.c:1091
+#: ../tools/common/t-app.c:3541 ../tools/common/t-favorites.c:1091
msgid "Could not find favorite"
msgstr "找不到收藏"
-#: ../tools/gda-sql.c:3982 ../tools/gda-sql.c:5568 ../tools/gda-sql.c:5646
+#: ../tools/common/t-app.c:3723 ../tools/common/t-app.c:3788
+#: ../tools/common/t-app.c:4503
#, c-format
msgid "No parameter named '%s' defined"
msgstr "没有定义名为 '%s' 的参数"
-#: ../tools/gda-sql.c:3993
+#: ../tools/common/t-app.c:3735
msgid "List of defined parameters"
msgstr "已定义的参数列表"
-#: ../tools/gda-sql.c:4032
+#: ../tools/common/t-app.c:3816
msgid "dimensions (columns x rows)"
msgstr "尺寸(列 x 行)"
-#: ../tools/gda-sql.c:4033
+#: ../tools/common/t-app.c:3817
msgid "List of kept data"
msgstr "保留数据列表"
-#: ../tools/gda-sql.c:4078 ../tools/gda-sql.c:4198 ../tools/gda-sql.c:4264
-#: ../tools/gda-sql.c:4306 ../tools/gda-sql.c:4350
+#: ../tools/common/t-app.c:3866 ../tools/common/t-app.c:3907
+#: ../tools/common/t-app.c:4030 ../tools/common/t-app.c:4099
+#: ../tools/common/t-app.c:4170
msgid "Missing argument"
msgstr "缺少参数"
-#: ../tools/gda-sql.c:4088 ../tools/gda-sql.c:4206 ../tools/gda-sql.c:4272
-#: ../tools/gda-sql.c:4359
+#: ../tools/common/t-app.c:3875 ../tools/common/t-app.c:3917
+#: ../tools/common/t-app.c:4038 ../tools/common/t-app.c:4107
#, c-format
msgid "Could not find dataset named '%s'"
msgstr "无法找到名为 '%s' 的数据集"
-#: ../tools/gda-sql.c:4227
+#: ../tools/common/t-app.c:4059
#, c-format
msgid "Could not identify column '%s'"
msgstr "无法识别列“%s”"
-#: ../tools/gda-sql.c:4297
+#: ../tools/common/t-app.c:4161
#, c-format
msgid "Unknown import format '%s'"
msgstr "未知的导入格式“%s”"
-#: ../tools/gda-sql.c:4318
+#: ../tools/common/t-app.c:4182
#, c-format
msgid "Could not import file '%s'"
msgstr "无法导入文件“%s”"
-#: ../tools/gda-sql.c:4412
-msgid "Missing foreign key declaration specification"
-msgstr "缺少外键声明规范"
-
-#: ../tools/gda-sql.c:4529
-msgid "Malformed foreign key declaration specification"
-msgstr "格式错误的外键声明规范"
+#: ../tools/common/t-app.c:4266
+#, c-format
+msgid "Graph written to '%s'\n"
+msgstr "图已写入“%s”\n"
-#: ../tools/gda-sql.c:4561
+#: ../tools/common/t-app.c:4269
#, c-format
-msgid "Malformed table name specification '%s'"
-msgstr "格式错误的表名规范“%s”"
+msgid ""
+"Graph written to '%s'\n"
+"Use 'dot' (from the GraphViz package) to create a picture, for example:\n"
+"\tdot -Tpng -o graph.png %s\n"
+"Note: set the GDA_SQL_VIEWER_PNG or GDA_SQL_VIEWER_PDF environment variables "
+"to view the graph\n"
+msgstr ""
+"图已写入“%s”\n"
+"使用“dot”(来自 GraphViz 软件包)来创建一张图，例如：\n"
+"\tdot -Tpng -o graph.png %s\n"
+"注：请设置环境变量 GDA_SQL_VIEWER_PNG 或 GDA_SQL_VIEWER_PDF 来查看对应的图\n"
-#: ../tools/gda-sql.c:4650 ../tools/gda-sql.c:4725
-msgid "Missing foreign key name argument"
-msgstr "缺少外键名参数"
+#: ../tools/common/t-app.c:4325
+msgid "Could not start HTTPD server"
+msgstr "无法启动 HTTPD 服务器"
+
+#: ../tools/common/t-app.c:4347
+msgid "HTTPD server stopped"
+msgstr "HTTPD 服务器已停止"
+
+#: ../tools/common/t-app.c:4366
+msgid "HTTPD server started"
+msgstr "HTTPD 服务器已启动"
+
+#: ../tools/common/t-app.c:4371
+msgid "Invalid port specification"
+msgstr "无效的端口指定"
-#: ../tools/gda-sql.c:4757 ../tools/gda-sql.c:5885
+#: ../tools/common/t-app.c:4408
msgid "Wrong row condition"
msgstr "错误和行条件"
-#: ../tools/gda-sql.c:4785
+#: ../tools/common/t-app.c:4437
msgid "No unique row identified"
msgstr "没有发现唯一的行"
-#: ../tools/gda-sql.c:4867 ../tools/gda-sql.c:5574
+#: ../tools/common/t-app.c:4509 ../tools/common/t-app.c:4651
msgid "Wrong number of arguments"
msgstr "参数个数错误"
-#: ../tools/gda-sql.c:4900
+#: ../tools/common/t-app.c:4521 ../tools/common/t-app.c:4536
+msgid "Could not write file"
+msgstr "不能写入文件"
+
+#: ../tools/common/t-app.c:4688
msgid "Missing data on which to operate"
msgstr "缺少操作的数据对象"
-#: ../tools/gda-sql.c:4905
+#: ../tools/common/t-app.c:4693
msgid "Missing row fields specifications"
msgstr "未规定行字段"
-#: ../tools/gda-sql.c:4923
+#: ../tools/common/t-app.c:4711
msgid "Wrong SELECT argument"
msgstr "错误的 SELECT 语句"
-#: ../tools/gda-sql.c:4961 ../tools/gda-sql.c:4989
+#: ../tools/common/t-app.c:4749 ../tools/common/t-app.c:4777
msgid "Wrong data field argument"
msgstr "错误的数据字段参数"
-#: ../tools/gda-sql.c:5039 ../tools/gda-sql.c:5136 ../tools/gda-sql.c:5229
-#: ../tools/gda-sql.c:5324
+#: ../tools/common/t-app.c:4849
+msgid "Missing foreign key declaration specification"
+msgstr "缺少外键声明规范"
+
+#: ../tools/common/t-app.c:4966
+msgid "Malformed foreign key declaration specification"
+msgstr "格式错误的外键声明规范"
+
+#: ../tools/common/t-app.c:4998
+#, c-format
+msgid "Malformed table name specification '%s'"
+msgstr "格式错误的表名规范“%s”"
+
+#: ../tools/common/t-app.c:5090 ../tools/common/t-app.c:5167
+msgid "Missing foreign key name argument"
+msgstr "缺少外键名参数"
+
+#: ../tools/common/t-app.c:5192 ../tools/common/t-app.c:5293
+#: ../tools/common/t-app.c:5390 ../tools/common/t-app.c:5488
msgid "Connection is not an LDAP connection"
msgstr "连接不是 LDAP 连接"
-#: ../tools/gda-sql.c:5061
+#: ../tools/common/t-app.c:5214
#, c-format
msgid "Unknown search scope '%s'"
msgstr "未知的搜索范围“%s”"
-#: ../tools/gda-sql.c:5071
+#: ../tools/common/t-app.c:5224
msgid "Missing filter which to operate"
msgstr "缺少要操作的过滤器"
-#: ../tools/gda-sql.c:5151
+#: ../tools/common/t-app.c:5308
msgid "Missing current DN or new DN specification"
msgstr "未规定当前 DN 或 新 DN"
-#: ../tools/gda-sql.c:5244
+#: ../tools/common/t-app.c:5405
msgid "Missing DN of LDAP entry"
msgstr "缺少 LDAP 记录的 DN"
-#: ../tools/gda-sql.c:5249
+#: ../tools/common/t-app.c:5410
msgid "Missing operation to perform on LDAP entry's attributes"
msgstr "缺少在 LDAP 记录属性上执行的操作"
-#: ../tools/gda-sql.c:5261
+#: ../tools/common/t-app.c:5422
#, c-format
msgid "Unknown operation '%s' to perform on LDAP entry's attributes"
msgstr "未知的对 LDAP 记录属性的操作“%s”"
-#: ../tools/gda-sql.c:5282
+#: ../tools/common/t-app.c:5443
#, c-format
msgid "Wrong attribute value specification '%s'"
msgstr "错误的属性值规定“%s”"
-#: ../tools/gda-sql.c:5338
+#: ../tools/common/t-app.c:5502
msgid "Missing DN (Distinguished name) argument"
msgstr "缺少 DN(识别名称) 参数"
-#: ../tools/gda-sql.c:5351
+#: ../tools/common/t-app.c:5515
#, c-format
msgid "Unknown '%s' argument"
msgstr "未知的“%s”参数"
-#: ../tools/gda-sql.c:5362
+#: ../tools/common/t-app.c:5526
#, c-format
msgid "Could not find entry with DN '%s'"
msgstr "找不到 DN 为“%s”的记录"
-#: ../tools/gda-sql.c:5371
+#: ../tools/common/t-app.c:5534 ../tools/common/t-config-info.c:123
+#: ../tools/common/t-config-info.c:292
+msgid "Attribute"
+msgstr "属性"
+
+#: ../tools/common/t-app.c:5535
msgid "Required?"
msgstr "要求？"
-#: ../tools/gda-sql.c:5373
+#: ../tools/common/t-app.c:5537
msgid "LDAP entry's Attributes"
msgstr "LDAP 记录的属性"
-#: ../tools/gda-sql.c:5586 ../tools/gda-sql.c:5600
-msgid "Could not write file"
-msgstr "不能写入文件"
+#: ../tools/common/t-config-info.c:73
+msgid "Installed providers list"
+msgstr "已安装的提供者列表"
-#: ../tools/gda-sql.c:5725
+#: ../tools/common/t-config-info.c:111
#, c-format
-msgid "Graph written to '%s'\n"
-msgstr "图已写入“%s”\n"
+msgid "Could not find provider '%s'"
+msgstr "找不到提供者“%s”"
+
+#: ../tools/common/t-config-info.c:126
+#, c-format
+msgid "Provider '%s' description"
+msgstr "提供者 '%s' 描述"
+
+#: ../tools/common/t-config-info.c:280
+#, c-format
+msgid "Could not find data source '%s'"
+msgstr "找不到数据源“%s”"
+
+#: ../tools/common/t-config-info.c:295
+#, c-format
+msgid "DSN '%s' description"
+msgstr "DSN '%s' 描述"
+
+#: ../tools/common/t-config-info.c:301
+msgid "DSN name"
+msgstr "DSN 名"
+
+#: ../tools/common/t-config-info.c:391
+msgid "System DSN?"
+msgstr "系统 DSN？"
+
+#: ../tools/common/t-config-info.c:397
+msgid "Yes"
+msgstr "是"
+
+#: ../tools/common/t-config-info.c:397
+msgid "No"
+msgstr "无"
+
+#: ../tools/common/t-config-info.c:428
+msgid "Last used"
+msgstr "上次使用"
-#: ../tools/gda-sql.c:5728
+#: ../tools/common/t-config-info.c:484
#, c-format
+msgid "(%s)"
+msgstr "(%s)"
+
+#: ../tools/common/t-config-info.c:566
+#, c-format
+msgid "Unknown criteria '%s'"
+msgstr "未知的条件“%s”"
+
+#: ../tools/common/t-config-info.c:675
+msgid "No home directory exists. No configuration directory is in use"
+msgstr ""
+
+#: ../tools/common/t-config-info.c:685
+#, fuzzy, c-format
+#| msgid "Error creating user specific configuration directory '%s'"
+msgid "Was not possible to create configuration directory at: %s"
+msgstr "创建用户特定的配置目录 %s 出错"
+
+#: ../tools/common/t-connection.c:270
+msgid "Analysing database schema"
+msgstr "正在分析数据库方案"
+
+#: ../tools/common/t-connection.c:297 ../tools/common/t-connection.c:437
+#: ../tools/common/t-connection.c:1209 ../tools/common/t-connection.c:1211
+#, c-format
+msgid "Error while fetching meta data from the connection: %s"
+msgstr "从连接中获取元数据出错：%s"
+
+#: ../tools/common/t-connection.c:344
+#, fuzzy
+#| msgid "Error while fetching meta data from the connection: %s"
+msgid "File containing the meta data associated to the connection"
+msgstr "从连接中获取元数据出错：%s"
+
+#: ../tools/common/t-connection.c:803
+#, c-format
+msgid "\tUsername for '%s': "
+msgstr "\t'%s' 的用户名： "
+
+#: ../tools/common/t-connection.c:810 ../tools/common/t-connection.c:825
+#, c-format
+msgid "No username for '%s'"
+msgstr "没有 '%s' 的用户名"
+
+#: ../tools/common/t-connection.c:834
+#, c-format
+msgid "\tPassword for '%s': "
+msgstr "\t'%s' 的口令： "
+
+#: ../tools/common/t-connection.c:843 ../tools/common/t-connection.c:852
+#, c-format
+msgid "No password for '%s'"
+msgstr "没有 '%s' 的口令"
+
+#: ../tools/common/t-connection.c:934
+#, fuzzy, 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"
msgid ""
-"Graph written to '%s'\n"
-"Use 'dot' (from the GraphViz package) to create a picture, for example:\n"
-"\tdot -Tpng -o graph.png %s\n"
-"Note: set the GDA_SQL_VIEWER_PNG or GDA_SQL_VIEWER_PDF environment variables "
-"to view the graph\n"
+"Date format for this connection will be: %s, where YYYY is the year, MM the "
+"month and DD the day\n"
msgstr ""
-"图已写入“%s”\n"
-"使用“dot”(来自 GraphViz 软件包)来创建一张图，例如：\n"
-"\tdot -Tpng -o graph.png %s\n"
-"注：请设置环境变量 GDA_SQL_VIEWER_PNG 或 GDA_SQL_VIEWER_PDF 来查看对应的图\n"
+"此连接的数据格式会是：%s%c%s%c%s，其中 YYYY 为年份，MM 为月份，DD 为日\n"
+
+#: ../tools/common/t-connection.c:942
+#, fuzzy
+#| 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"
+msgid ""
+"Format of the date used for the connection, where YYYY is the year, MM the "
+"month and DD the day"
+msgstr ""
+"此连接的数据格式会是：%s%c%s%c%s，其中 YYYY 为年份，MM 为月份，DD 为日\n"
+
+#: ../tools/common/t-connection.c:1075
+#, fuzzy
+#| msgid "_Data source"
+msgid "Data source"
+msgstr "数据源(_D)"
+
+#: ../tools/common/t-connection.c:1102
+msgid "unnamed"
+msgstr "未命名的"
+
+#: ../tools/common/t-connection.c:1105
+msgid "data source"
+msgstr "数据源"
+
+#: ../tools/common/t-connection.c:1202
+msgid "Getting database schema information"
+msgstr "正在获取数据库方案信息"
-#: ../tools/gda-sql.c:5785
-msgid "HTTPD server stopped"
-msgstr "HTTPD 服务器已停止"
+#: ../tools/common/t-connection.c:1536
+msgid "Connection not yet opened"
+msgstr "连接尚未打开"
-#: ../tools/gda-sql.c:5804
-msgid "Could not start HTTPD server"
-msgstr "无法启动 HTTPD 服务器"
+#: ../tools/common/t-connection.c:1542
+msgid "Can't initialize dictionary to store table preferences"
+msgstr "无法初始化保存表首选项的字典"
-#: ../tools/gda-sql.c:5808
-msgid "HTTPD server started"
-msgstr "HTTPD 服务器已启动"
+#: ../tools/common/t-connection.c:1588 ../tools/common/t-connection.c:1594
+#: ../tools/common/t-connection.c:1730 ../tools/common/t-favorites.c:628
+#: ../tools/common/t-favorites.c:634 ../tools/common/t-favorites.c:1061
+#: ../tools/common/t-favorites.c:1068
+msgid "Can't initialize transaction to access favorites"
+msgstr "无法初始化用以访问收藏的事务"
-#: ../tools/gda-sql.c:5813
-msgid "Invalid port specification"
-msgstr "无效的端口指定"
+#: ../tools/common/t-connection.c:1675 ../tools/common/t-favorites.c:807
+#: ../tools/common/t-favorites.c:1136
+msgid "Can't commit transaction to access favorites"
+msgstr "无法提交事务以访问收藏"
-#: ../tools/gda-sql.c:6006
-msgid "Command is incomplete"
-msgstr "命令不完整"
+#: ../tools/common/t-connection.c:2234
+msgid "Could not execute LDAP search"
+msgstr "无法执行 LDAP 搜索"
-#: ../tools/html-doc.c:86
-msgid "Generated by the GDA SQL console"
-msgstr "由 GDA SQL 控制台生成"
+#: ../tools/common/t-context.c:327
+#, c-format
+msgid "Could not interpret the '%s' parameter's value"
+msgstr "无法解释 '%s' 参数的值"
-#: ../tools/html-doc.c:108
-msgid "Console"
-msgstr "控制台"
+#: ../tools/common/t-context.c:343
+#, c-format
+msgid "No internal parameter named '%s' required by query"
+msgstr "没有查询所需要的名为 '%s' 的内部参数"
-#: ../tools/tools-favorites.c:184 ../tools/tools-favorites.c:193
+#: ../tools/common/t-context.c:426
+msgid "Connection closed"
+msgstr "连接已关闭"
+
+#: ../tools/common/t-context.c:557
+#, c-format
+msgid "Can't open file '%s' for writing: %s\n"
+msgstr "无法为写入打开文件 '%s'：%s\n"
+
+#: ../tools/common/t-context.c:571 ../tools/common/t-context.c:580
+#, c-format
+msgid "Can't open pipe '%s': %s"
+msgstr "无法打开管道“%s”：%s"
+
+#: ../tools/common/t-favorites.c:184 ../tools/common/t-favorites.c:193
msgid "Can't initialize dictionary to store favorites"
msgstr "无法初始化目录以存储收藏"
-#: ../tools/tool-utils.c:37
+#: ../tools/common/t-favorites.c:185
+#, fuzzy, c-format
+#| msgid "Can't initialize dictionary to store favorites"
+msgid "Can't initialize dictionary to store favorites :%s"
+msgstr "无法初始化目录以存储收藏"
+
+#: ../tools/common/t-term-context.c:523
+#, c-format
+msgid "Can't open file '%s' for reading: %s\n"
+msgstr "无法打开文件 '%s' 以便读取：%s\n"
+
+#: ../tools/common/t-utils.c:43
msgid "not enforced"
msgstr "非强制的"
-#: ../tools/tool-utils.c:39
+#: ../tools/common/t-utils.c:45
msgid "stop with error"
msgstr "出错时停止"
-#: ../tools/tool-utils.c:41
+#: ../tools/common/t-utils.c:47
msgid "stop with error, not deferrable"
msgstr "出错时停止，无延迟"
-#: ../tools/tool-utils.c:43
+#: ../tools/common/t-utils.c:49
msgid "cascade changes"
msgstr "级联更改"
-#: ../tools/tool-utils.c:45
+#: ../tools/common/t-utils.c:51
msgid "set to NULL"
msgstr "设置为 NULL"
-#: ../tools/tool-utils.c:47
+#: ../tools/common/t-utils.c:53
msgid "set to default value"
msgstr "设置为默认值"
-#: ../tools/web-server.c:569 ../tools/web-server.c:570
+#: ../tools/common/t-utils.c:208
+#, fuzzy, c-format
+#| msgid "Syntax error after '\\'"
+msgid "Syntax error"
+msgstr "“\\”之后有语法错误"
+
+#: ../tools/common/t-virtual-connection.c:91
+msgid "Bound connection is used"
+msgstr "绑定连接已使用"
+
+#: ../tools/common/t-virtual-connection.c:117
+msgid "Virtual connection using this connection is busy"
+msgstr "使用此连接的虚拟连接正忙"
+
+#: ../tools/common/web-server.c:505 ../tools/common/web-server.c:506
msgid "Authentication required"
msgstr "要求认证"
-#: ../tools/web-server.c:572
+#: ../tools/common/web-server.c:508
msgid ""
"Enter authentification token as set from console, or leave empty if none "
"required"
msgstr "输入终端中设置的认证令牌，若不需要则留空"
-#: ../tools/web-server.c:638
+#: ../tools/common/web-server.c:570
msgid "Token:"
-msgstr "令牌"
+msgstr "令牌："
-#: ../tools/web-server.c:779
+#: ../tools/common/web-server.c:711
msgid "SQL console:"
msgstr "SQL 控制台："
-#: ../tools/web-server.c:859 ../tools/web-server.c:1879
+#: ../tools/common/web-server.c:791 ../tools/common/web-server.c:1791
msgid "Tables"
msgstr "表"
-#: ../tools/web-server.c:859
+#: ../tools/common/web-server.c:791
#, c-format
msgid "Tables in the '%s' schema"
msgstr "'%s' 方案中的表"
-#: ../tools/web-server.c:865 ../tools/web-server.c:1884
+#: ../tools/common/web-server.c:797 ../tools/common/web-server.c:1796
msgid "Views"
msgstr "视图"
-#: ../tools/web-server.c:865
+#: ../tools/common/web-server.c:797
#, c-format
msgid "Views in the '%s' schema"
msgstr "'%s' 方案中的视图"
-#: ../tools/web-server.c:924
+#: ../tools/common/web-server.c:841
#, c-format
msgid "Columns for the '%s' table:"
msgstr "'%s' 表的列："
-#: ../tools/web-server.c:970
+#: ../tools/common/web-server.c:883
msgid "Primary key:"
msgstr "主键："
-#: ../tools/web-server.c:1075
+#: ../tools/common/web-server.c:988
msgid "Relations:"
msgstr "关系："
-#: ../tools/web-server.c:1092
+#: ../tools/common/web-server.c:1005
msgid "Foreign keys:"
msgstr "外键："
-#: ../tools/web-server.c:1104
+#: ../tools/common/web-server.c:1017
#, c-format
msgid "To '%s':"
msgstr "到 '%s'："
-#: ../tools/web-server.c:1279
+#: ../tools/common/web-server.c:1192
msgid "View definition:"
msgstr "视图定义："
-#: ../tools/web-server.c:1354
+#: ../tools/common/web-server.c:1267
#, c-format
msgid "Trigger '%s' for the '%s.%s' table:"
msgstr "'%s.%s' 表的触发器 '%s'："
-#: ../tools/web-server.c:1374
+#: ../tools/common/web-server.c:1287
#, c-format
msgid "Trigger fired for: %s"
msgstr "触发器触发，为：%s"
-#: ../tools/web-server.c:1378
+#: ../tools/common/web-server.c:1291
#, c-format
msgid "Time at which the trigger is fired: %s"
msgstr "触发器的触发时间：%s"
-#: ../tools/web-server.c:1382
+#: ../tools/common/web-server.c:1295
msgid "Action:"
msgstr "操作："
-#: ../tools/web-server.c:1611
+#: ../tools/common/web-server.c:1523
msgid "Triggers:"
msgstr "触发器："
-#: ../tools/web-server.c:1643 ../tools/web-server.c:1737
+#: ../tools/common/web-server.c:1555 ../tools/common/web-server.c:1649
#, c-format
msgid "For the '%s.%s' table:"
-msgstr "对于 '%s.%s' 表"
+msgstr "对于 '%s.%s' 表:"
-#: ../tools/web-server.c:1709
+#: ../tools/common/web-server.c:1621
#, c-format
msgid "Triggers in the '%s' schema:"
msgstr "'%s' 方案中的触发器："
-#: ../tools/web-server.c:1863
+#: ../tools/common/web-server.c:1775
#, c-format
msgid "Database information for '%s'"
msgstr "对 '%s' 的数据库信息"
-#: ../tools/web-server.c:1868
+#: ../tools/common/web-server.c:1780
msgid "Database information"
-msgstr "数据库信息："
+msgstr "数据库信息"
-#: ../tools/web-server.c:1877
+#: ../tools/common/web-server.c:1789
msgid "Objects"
msgstr "对象"
-#: ../tools/web-server.c:1889
+#: ../tools/common/web-server.c:1801
msgid "Triggers"
msgstr "触发器"
+#: ../tools/common/web-server.c:1873
+msgid "Command is incomplete"
+msgstr "命令不完整"
+
+#: ../tools/misc/gda-list-server-op.c:50
+msgid "Gda server operations list"
+msgstr "Gda 操作列表"
+
+#: ../tools/misc/gda-list-server-op.c:60
+#, c-format
+msgid "Using XML descriptions in %s\n"
+msgstr "在 %s 中使用 XML 描述\n"
+
+#: ../tools/misc/gda-list-server-op.c:67
+#, c-format
+msgid "Could not create provider object: %s\n"
+msgstr "无法创建提供者对象：%s\n"
+
+#: ../tools/misc/gda-list-server-op.c:76
+#, c-format
+msgid "Existing operation types for provider '%s':\n"
+msgstr "提供者 '%s' 存在的操作类型：\n"
+
+#: ../tools/misc/gda-list-server-op.c:78
+#, c-format
+msgid "Existing operation types:\n"
+msgstr "存在的操作类型：\n"
+
+#: ../tools/misc/gda-list-server-op.c:96
+#, c-format
+msgid "Description for type: %s\n"
+msgstr "类型的描述：%s\n"
+
+#: ../tools/misc/gda-list-server-op.c:124
+#, c-format
+msgid "Operation not supported\n"
+msgstr "操作不支持\n"
+
+#: ../tools/misc/gda-list-server-op.c:126
+#, c-format
+msgid "Error: %s\n"
+msgstr "错误：%s\n"
+
+#: ../tools/misc/gda-list-server-op.c:379
+#, c-format
+msgid "Can't parse file '%s', ignoring it"
+msgstr "无法解析文件 '%s'，忽略它"
+
+#~ msgid "Configured data sources in the system"
+#~ msgstr "在系统中配置了的数据源"
+
+#~ msgid "Data Source Properties"
+#~ msgstr "数据源属性"
+
+#~ msgid "Test"
+#~ msgstr "测试"
+
+#~ msgid "Browse"
+#~ msgstr "浏览器"
+
+#~ msgid "Change the data source properties (the name can't be modified)."
+#~ msgstr "更改数据源属性 (名称不可更改)。"
+
+#~ msgid ""
+#~ "For information only, this data source is a system wide data source\n"
+#~ "and you don't have the permission change it."
+#~ msgstr "要只获取信息，此数据源是全系统数据源并且您没有权限修改它。"
+
+#~ msgid "Could not execute browser program"
+#~ msgstr "无法执行浏览器程序"
+
+#~ 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."
+#~ msgstr ""
+#~ "以下字段描述了打开一个连接时所需的信息(必填字段标有星号)。该信息是针对特定"
+#~ "数据库的，所以请查阅手册了解详细信息。"
+
+#~ msgid "Data source _name:"
+#~ msgstr "数据源名称(_N)："
+
+#~ msgid "Database"
+#~ msgstr "数据库"
+
+#~ msgid "Close this window"
+#~ msgstr "关闭此窗口"
+
+#~ msgid "_New datasource"
+#~ msgstr "新建数据源(_N)"
+
+#~ msgid "_Delete datasource"
+#~ msgstr "删除数据源(_D)"
+
+#~ msgid "Delete selected data source"
+#~ msgstr "删除选中的数据源"
+
+#~ msgid "Edit properties for selected data source"
+#~ msgstr "编辑选中的数据源的属性"
+
+#~ msgid "_About"
+#~ msgstr "关于(_A)"
+
+#~ msgid "About GNOME-DB"
+#~ msgstr "关于 GNOME-DB"
+
+#~ msgid "Installed providers"
+#~ msgstr "已安装的提供者"
+
+#~ msgid "Meta update error"
+#~ msgstr "元数据更新错误"
+
+#~ msgid "Wrong filter arguments"
+#~ msgstr "错误的过滤器参数"
+
+#~ msgid "Expected tag <gda_value> or <gda_array_value>, got <%s>, ignoring"
+#~ msgstr "期望 <gda_value> 或 <gda_array_value> 标记，然而获得了 <%s>，忽略"
+
+#~ msgid "GdaDataModel refused value change"
+#~ msgstr "GdaDataModel 拒绝了值更改"
+
+#~ msgid "Could not re-run SELECT statement: %s"
+#~ msgstr "无法重新运行 SELECT 语句：%s"
+
+#~ msgid "Incorrect SQL expression"
+#~ msgstr "错误的 SQL 表达式"
+
+#~ msgid "Extension loading is not supported"
+#~ msgstr "不支持加载扩展"
+
+#~| msgid "Could not find table '%s.%s'"
+#~ msgid "Could not find handler %lu"
+#~ msgstr "找不到处理程序“%lu”"
+
+#~ msgid "Properties"
+#~ msgstr "属性"
+
+#~ msgid "Data size"
+#~ msgstr "数据大小"
+
+#~ msgid "Format is hh:mm:ss"
+#~ msgstr "格式为 hh:mm:ss"
+
+#~ msgid "Value is NULL"
+#~ msgstr "值为 NULL"
+
+#~ msgid "Value will be determined by default"
+#~ msgstr "值将由默认决定"
+
+#~ msgid ""
+#~ "Error while deserializing data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "在反序列化数据时出错：\n"
+#~ "%s"
+
+#~ msgid "Serialized picture"
+#~ msgstr "序列化图片"
+
+#~ msgid ""
+#~ "Set to TRUE if data comes from a serialized GdkPixbuf (F-Spot for example)"
+#~ msgstr "若数据来自一个序列化的 GdkPixbuf (如 F-Spot)，设为 TRUE"
+
+#~ msgid "hello"
+#~ msgstr "hello"
+
+#~ msgid "Show Entry actions"
+#~ msgstr "显示记录操作"
+
+#~ msgid ""
+#~ "'%s' DTD not parsed successfully. XML data layout validation will not be "
+#~ "performed (some errors may occur)"
+#~ msgstr ""
+#~ "“%s” DTD 没有解析成功。将不执行 XML 数据布局有效性检查(可能出现某些错误)"
+
+#~ msgid "Delete the current record"
+#~ msgstr "删除当前记录"
+
+#~ msgid "Create a new record"
+#~ msgstr "创建一个新记录"
+
+#~ msgid "Go to first record"
+#~ msgstr "转到第一条记录"
+
+#~ msgid "Go to last record"
+#~ msgstr "转到最后一条记录"
+
+#~ msgid "Go to previous record"
+#~ msgstr "转到上一条记录"
+
+#~ msgid "Go to next record"
+#~ msgstr "转到下一条记录"
+
+#~ msgid "Filter records"
+#~ msgstr "过滤记录"
+
+#~ msgid "Global Actions visible"
+#~ msgstr "全局操作可见"
+
+#~ msgid "_Set filter"
+#~ msgstr "设置过滤器(_S)"
+
+#~ msgid "_Unset filter"
+#~ msgstr "重设过滤器(_U)"
+
+#~ msgid "<b>Field properties:</b>"
+#~ msgstr "<b>字段属性：</b>"
+
+#~ msgid "<b>Fields:</b>"
+#~ msgstr "<b>字段:</b>"
+
+#~ msgid "Provider for BDB SQL databases"
+#~ msgstr "BDB SQL 数据库的提供者"
+
+#~ msgid "No GdaLdapEntry specified to define attributes to add"
+#~ msgstr "没有为定义待添加的属性指定 GdaLdapEntry"
+
+#~ msgid "No GdaLdapEntry specified to define attributes to remove"
+#~ msgstr "没有为定义待移除的属性指定 GdaLdapEntry"
+
+#~ msgid "No GdaLdapEntry specified to define attributes to replace"
+#~ msgstr "没有为定义待替换的属性指定 GdaLdapEntry"
+
+#~ msgid "Empty field specified in foreign key constraint"
+#~ msgstr "在外键约束中指定了空字段"
+
+#~ msgid "No referenced table specified in foreign key constraint"
+#~ msgstr "在外键约束中没有指定引用表"
+
+#~ msgid "Empty referenced field specified in foreign key constraint"
+#~ msgstr "在外键约束中指定了空引用字段"
+
+#~ msgid "Incorrect specified column name"
+#~ msgstr "指定列的名称错误"
+
+#~ msgid "With OIDs"
+#~ msgstr "带有 OIDs"
+
+#~ msgid "c%u"
+#~ msgstr "c%u"
+
+#~ msgid "History"
+#~ msgstr "历史"
+
+#~ msgid "Bookmarks"
+#~ msgstr "书签"
+
+#~ msgid "Begin"
+#~ msgstr "开始"
+
+#~ msgid "Commit"
+#~ msgstr "提交"
+
+#~ msgid "Rollback"
+#~ msgstr "回滚"
+
+#~ msgid "Builder"
+#~ msgstr "生成器"
+
+#~ msgid "Ldap entries"
+#~ msgstr "Ldap 记录"
+
+#~ msgid "Add table"
+#~ msgstr "添加表"
+
+#~ msgid "Grid"
+#~ msgstr "网格"
+
+#~ msgid "Form"
+#~ msgstr "表单"
+
+#~ msgid "Use the whole screen"
+#~ msgstr "使用整个屏幕"
+
+#~ msgid "_Connection"
+#~ msgstr "连接(_C)"
+
+#~ msgid "_Connect"
+#~ msgstr "连接(_C)"
+
+#~ msgid ""
+#~ "Use connection to create\n"
+#~ "a new binding connection to access data\n"
+#~ "from multiple databases at once"
+#~ msgstr ""
+#~ "通过连接创建\n"
+#~ "一个新的绑定连接来一次访问\n"
+#~ "来自多个数据库的数据"
+
+#~ msgid "Connections list"
+#~ msgstr "连接列表"
+
+#~ msgid "Fetch meta data"
+#~ msgstr "获取元数据"
+
+#~ msgid "_Close Connection"
+#~ msgstr "关闭连接(_C)"
+
+#~ msgid "Close this connection"
+#~ msgstr "关闭此连接"
+
+#~ msgid "_Quit"
+#~ msgstr "退出(_Q)"
+
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "_Display"
+#~ msgstr "显示(_D)"
+
+#~ msgid "Display"
+#~ msgstr "显示"
+
+#~ msgid "_Perspective"
+#~ msgstr "透视(_P)"
+
+#~ msgid "_Window"
+#~ msgstr "窗口(_W)"
+
+#~ msgid "Window"
+#~ msgstr "窗口"
+
+#~ msgid "Open a new window for current connection"
+#~ msgstr "为当前连接打开一个新窗口"
+
+#~ msgid "New Window for _Connection"
+#~ msgstr "为连接新建窗口(_C)"
+
+#~ msgid "Open a new window for a connection"
+#~ msgstr "为某个连接打开一个新窗口"
+
+#~ msgid "_Manual"
+#~ msgstr "手工(_M)"
+
+#~ msgid "Manual"
+#~ msgstr "手工"
+
+#~ msgid "Do you want to quit the application?"
+#~ msgstr "要退出程序吗？"
+
+#~ msgid "all the connections will be closed."
+#~ msgstr "所有的连接都将被关闭"
+
+#~ msgid "the connection will be closed."
+#~ msgstr "连接将被关闭"
+
+#~ msgid "Database browser"
+#~ msgstr "数据库浏览器"
+
+#~ msgid "_Toggle mode"
+#~ msgstr "切换模式(T)"
+
+#~ msgid "Show or hide favorites"
+#~ msgstr "显示或隐藏收藏"
+
+#~ msgid "_Manager"
+#~ msgstr "管理器(_M)"
+
+#~ msgid "Manager"
+#~ msgstr "管理器"
+
+#~ msgid "_New Data Manager"
+#~ msgstr "新建数据管理器(_N)"
+
+#~ msgid "Browse your database's contents"
+#~ msgstr "浏览您的数据库内容"
+
+#~ msgid "_LDAP"
+#~ msgstr "_LDAP"
+
+#~ msgid "_New LDAP Entries Browser"
+#~ msgstr "新建 LDAP 记录浏览器(_N)"
+
+#~ msgid "Open a new LDAP entries browser"
+#~ msgstr "打开一个新 LDAP 记录浏览器"
+
+#~ msgid "_New LDAP Classes Browser"
+#~ msgstr "新建 LDAP 类浏览器(_N)"
+
+#~ msgid "Open a new LDAP classes browser"
+#~ msgstr "打开一个新 LDAP 类浏览器"
+
+#~ msgid "Open a new LDAP search form"
+#~ msgstr "打开一个新的 LDAP 搜索表单"
+
+#~ msgid "Previous Class"
+#~ msgstr "上个类"
+
+#~ msgid "Next Class"
+#~ msgstr "下个类"
+
+#~ msgid "Previous Entry"
+#~ msgstr "上一记录"
+
+#~ msgid "Next Entry"
+#~ msgstr "下一记录"
+
+#~ msgid "Define as Table"
+#~ msgstr "定义为表"
+
+#~ msgid "[DSN|connection string]..."
+#~ msgstr "[DSN|连接字符串]..."
+
+#~ msgid "All files are in the directory: %s\n"
+#~ msgstr "所有文件都在目录中：%s\n"
+
+#~ msgid ""
+#~ "Error while purging files used to store information about each "
+#~ "connection: %s\n"
+#~ msgstr "在冲洗(purge)用于保存各个连接信息的文件时出错：%s\n"
+
+#~ msgid "Indent"
+#~ msgstr "缩进"
+
+#~ msgid "Favorite"
+#~ msgstr "收藏"
+
+#~ msgid "_Undo"
+#~ msgstr "撤销(_U)"
+
+#~ msgid "Undo last change"
+#~ msgstr "撤销最后的更改"
+
+#~ msgid "_Query"
+#~ msgstr "查询(_Q)"
+
+#~ msgid "Query"
+#~ msgstr "查询"
+
+#~ msgid "_New Editor"
+#~ msgstr "新编辑器(_N)"
+
+#~ msgid "Open a new query editor"
+#~ msgstr "打开一个新查询编辑器"
+
+#~ msgid "Re-execute query"
+#~ msgstr "重新执行查询"
+
+#~ msgid "Tables' index"
+#~ msgstr "表索引"
+
+#~ msgid "_Contents"
+#~ msgstr "内容(_C)"
+
+#~ msgid "View contents"
+#~ msgstr "查看内容"
+
+#~ msgid "_Schema"
+#~ msgstr "方案(_S)"
+
+#~ msgid "_New Diagram"
+#~ msgstr "新图示(_N)"
+
+#~ msgid "_Table"
+#~ msgstr "表(_T)"
+
+#~ msgid "Add table to favorites"
+#~ msgstr "添加表到收藏"
+
+#~ msgid "Declare a foreign key for table"
+#~ msgstr "为表声明一个外键"
+
+#~ msgid "Help is being loaded, please wait..."
+#~ msgstr "正在加载帮助，请稍候..."
+
+#~ msgid "Failed to remove: "
+#~ msgstr "移除失败： "
+
+#~ msgid "No file to purge!"
+#~ msgstr "没有要 purge 的文件！"
+
+#~ msgid "GDA SQL console version "
+#~ msgstr "GDA SQL 控制台版本 "
+
+#~ msgid "Welcome to the GDA SQL console, version "
+#~ msgstr "欢迎来到 GDA SQL 控制台，版本 "
+
+#~ 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 (the '.' can be replaced by a '\\')\n"
+#~ " or any SQL query terminated by a semicolon\n"
+#~ "\n"
+#~ msgstr ""
+#~ "输入：%s 显示用法和颁发条款\n"
+#~ " %s 或 %s 获取内部命令的帮助\n"
+#~ " %s (或 CTRL-D) 退出(“.”可以用“\\”代替)\n"
+#~ " 或任何以“;”结尾的查询语句\n"
+#~ "\n"
+
+#~ msgid "Opening connection '%s' (GDA_SQL_CNC environment variable): "
+#~ msgstr "正在打开连接“%s”(GDA_SQL_CNC 环境变量)："
+
+#~ msgid "Can't open connection defined by GDA_SQL_CNC: %s\n"
+#~ msgstr "无法打开由 GDA_SQL_CNC 定义的连接：%s\n"
+
+#~ msgid "Can't run HTTP server on port %d\n"
+#~ msgstr "无法在端口 %d 运行 HTTP 服务\n"
+
+#~ msgid ""
+#~ "All the information related to the '%s' connection will be stored in the "
+#~ "'%s' file\n"
+#~ msgstr "所有与 '%s' 关联的信息将保存在 '%s' 文件中\n"
+
+#~ msgid "Error getting meta data in background: %s\n"
+#~ msgstr "在背景中获取元数据出错：%s\n"
+
+#~ msgid ""
+#~ "Getting database schema information for connection '%s', this may take "
+#~ "some time... "
+#~ msgstr "为连接 '%s' 获取数据库方案信息，这可能需要一些时间... "
+
+#~ msgid "Bound connections are as:"
+#~ msgstr "绑定连接的形式为："
+
#~ msgid ""
#~ "Unique GThread from which the connection will be available.This should "
#~ "only be modified by the database providers' implementation"
@@ -11039,12 +12135,6 @@ msgstr "触发器"
#~ "GdaServerProvider 对象实现了 %s 虚方法，但没有实现 %s，请向 http://";
#~ "bugzilla.gnome.org/ 报告“libgda”产品的缺陷。"
-#~ msgid "Provider error: %s method not implemented for provider %s"
-#~ msgstr "提供者错误：%s 方法没有为提供者 %s 实现"
-
-#~ msgid "Provider does not support asynchronous connection open"
-#~ msgstr "提供者不支持打开异步连接"
-
#~ msgid "Provider does not support asynchronous statement execution"
#~ msgstr "提供者不支持异步语句执行"
@@ -11218,9 +12308,6 @@ msgstr "触发器"
#~ msgid "Set as original"
#~ msgstr "设为原始"
-#~ msgid "Set as default"
-#~ msgstr "设为默认"
-
#~ msgid ""
#~ "Bind several connections together into the CNC_NAME virtual connection"
#~ msgstr "绑定多个连接一起进入 CNC_NAME 虚拟连接"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
