[mergeant] Update Simplified Chinese translation.

From: Aron Xu <aronxu src gnome org>
To: commits-list gnome org
Cc:
Subject: [mergeant] Update Simplified Chinese translation.
Date: Fri, 26 Feb 2010 07:09:26 +0000 (UTC)
commit 41b11d7d3f15265bcf2622ee1a3e04c891440b07
Author: Aron Xu <aronxu gnome org>
Date:   Fri Feb 26 15:08:25 2010 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po | 1064 +++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 661 insertions(+), 403 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7abf9b6..43a3a20 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,43 +1,76 @@
 # Simplified Chinese translation for mergeant.
-# Copyright (C) 2003 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2003, 2004, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mergeant package.
 # Funda Wang <fundawang linux net cn>, 2003.
-# Fan Zhang <a17841 bigpond com>, 2004
-# QAed by Funda Wang, 2004-05-23
+# Fan Zhang <a17841 bigpond com>, 2004, 2010.
+#    QAed by Funda Wang, 2004-05-23
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mergeant\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-11 13:48+0100\n"
-"PO-Revision-Date: 2004-05-23 06:14+0800\n"
-"Last-Translator: Fan Zhang <a17841 bigpond com>\n"
-"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
+"Project-Id-Version: mergeant master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=mergeant&component=general\n"
+"POT-Creation-Date: 2009-10-08 12:26+0000\n"
+"PO-Revision-Date: 2010-02-26 15:08+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/mergeant.keys.in.h:1
-msgid "Documents"
-msgstr "æ??æ¡£"
-
-#: data/mergeant.keys.in.h:2
+#: ../data/mergeant.xml.in.h:1
 msgid "Mergeant database file"
 msgstr "Mergeant æ?°æ?®åº?æ??ä»¶"
 
-#: mergeant.desktop.in.h:1
+#: ../mergeant.desktop.in.h:1
+msgid "Database Administration"
+msgstr "æ?°æ?®åº?ç®¡ç??"
+
+#: ../mergeant.desktop.in.h:2
 msgid "Maintain and query a SQL database"
 msgstr "ç»´æ?¤å??æ?¥è¯¢ SQL æ?°æ?®åº?"
 
-#: mergeant.desktop.in.h:2
+#: ../mergeant.desktop.in.h:3
 msgid "Mergeant Database Administration"
 msgstr "Mergeant æ?°æ?®åº?ç®¡ç??"
 
-#: src/query-druid.c:282
-msgid "New query"
-msgstr ""
+#: ../src/mg-extra-formgrid.c:166
+msgid "Toggle between grid and form presentations"
+msgstr "å?¨ç½?æ ¼å??è¡¨å??æ¼?ç¤ºä¹?é?´å??æ?¢"
+
+#: ../src/mg-plugin-editor.c:146
+msgid "Data entry type:"
+msgstr "æ?°æ?®æ?¡ç?®ç±»å??ï¼?"
+
+#: ../src/mg-plugin-editor.c:151
+msgid "Options:"
+msgstr "é??é¡¹ï¼?"
+
+#: ../src/mg-plugin-editor.c:156
+msgid "Preview:"
+msgstr "é¢?è§?ï¼?"
+
+#: ../src/mg-plugin-editor.c:319 ../src/ws-tables.c:765
+msgid "Default"
+msgstr "é»?è®¤"
+
+#: ../src/mg-plugin-editor.c:367
+#, c-format
+msgid ""
+"Options '%s' are set for the '%s' plugin, but it does not have any option"
+msgstr "é??é¡¹â??%sâ??æ?¯ä¸ºâ??%sâ??æ??ä»¶è®¾ç½®ç??ï¼?ä½?æ?¯å®?æ²¡æ??ä»»ä½?é??é¡¹"
+
+#: ../src/mg-plugin-editor.c:374
+#, c-format
+msgid "Plugin editor cannot handle %s objects"
+msgstr "æ??ä»¶ç¼?è¾?å?¨ä¸?è?½å¤?ç?? %s å¯¹è±¡"
+
+#: ../src/mg-plugin-editor.c:392
+#, c-format
+msgid "Options '%s=%s' is set but unknown to the plugin used"
+msgstr "é??é¡¹â??%s=%sâ??å·²ç»?è®¾ç½®ä½?æ?¯å¯¹äº?ä½¿ç?¨ç??æ??ä»¶æ?¯æ?ªç?¥ç??"
 
-#: src/query-druid.c:284
+#: ../src/query-druid.c:294
 msgid ""
 "This druid allows you to create a new query.\n"
 "\n"
@@ -48,343 +81,378 @@ msgid ""
 "The query can be created either with a point and click interface or entering "
 "the corresponding SQL statement."
 msgstr ""
+"æ¤ druid å??è®¸æ?¨å??å»ºä¸?ä¸ªæ?°æ?¥è¯¢ã??\n"
+"\n"
+"æ?¥è¯¢å?¯ä»¥æ?¯ä»»ä½?ç±»å?? (SELECT, INSERT, UPDATE or DELETE) ç??æ?°æ?®å¤?ç??æ?¥è¯¢ï¼?ä¹?å?¯ä»¥"
+"æ?¯ä¸?ä¸ªè??å??æ?¥è¯¢ (UNION, INTERSECT or EXCEPT)ã??\n"
+"\n"
+"æ?¥è¯¢æ?¢å?¯ä»¥é??è¿?ä½¿ç?¨æ??å??ç?¹å?»ç??é?¢ä¹?å?¯ä»¥é??è¿?è¾?å?¥å¯¹åº?ç?? SQL è¯å?¥å??å»ºã??"
 
-#: src/query-druid.c:311
-#, fuzzy
-msgid "Query attributes"
-msgstr "æ?¥è¯¢"
+#: ../src/query-druid.c:304
+msgid "New query"
+msgstr "æ?°æ?¥è¯¢"
 
-#: src/query-druid.c:315
-#, fuzzy
+#: ../src/query-druid.c:325
 msgid "Name and description:"
-msgstr "æ??è¿°ï¼?"
+msgstr "å??ç§°æ??è¿°ï¼?"
 
-#: src/query-druid.c:329 src/query-editor.c:218 src/ws-dbrels.c:435
-#, fuzzy
+#: ../src/query-druid.c:337 ../src/query-editor.c:228 ../src/ws-dbrels.c:527
 msgid "Name:"
-msgstr "å??ç§°"
+msgstr "å??ç§°ï¼?"
 
-#: src/query-druid.c:336
-#, fuzzy
+#: ../src/query-druid.c:343
 msgid "Untitled"
-msgstr "æ? é¢?"
+msgstr "æ?ªå?½å??"
 
-#: src/query-druid.c:342 src/query-editor.c:230 src/ws-dbrels.c:441
-#, fuzzy
+#: ../src/query-druid.c:348 ../src/query-editor.c:240 ../src/ws-dbrels.c:533
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: src/query-druid.c:353
-#, fuzzy
+#: ../src/query-druid.c:357
 msgid "Type of query:"
-msgstr "é??æ?©ä¸?ä¸ªæ?¥è¯¢ï¼?"
+msgstr "æ?¥è¯¢ç??ç±»å??ï¼?"
 
-#: src/query-druid.c:362
+#: ../src/query-druid.c:365
 msgid "Point & click wizard"
-msgstr ""
+msgstr "æ??å??ç?¹å?»å??å¯¼"
 
-#: src/query-druid.c:376
+#: ../src/query-druid.c:377
 msgid "SELECT query"
-msgstr ""
+msgstr "SELECT æ?¥è¯¢"
 
-#: src/query-druid.c:385
+#: ../src/query-druid.c:385
 msgid "INSERT query"
-msgstr ""
+msgstr "INSERT æ?¥è¯¢"
 
-#: src/query-druid.c:393
+#: ../src/query-druid.c:392
 msgid "UPDATE query"
-msgstr ""
+msgstr "UPDATE æ?¥è¯¢"
 
-#: src/query-druid.c:401
+#: ../src/query-druid.c:399
 msgid "DELETE query"
-msgstr ""
+msgstr "DELETE æ?¥è¯¢"
 
-#: src/query-druid.c:409
+#: ../src/query-druid.c:406
 msgid "Aggreation query (union, intersect or except)"
-msgstr ""
+msgstr "è??å??æ?¥è¯¢ (union, intersect or except)"
 
-#: src/query-druid.c:417
+#: ../src/query-druid.c:413
 msgid "SQL query (of any type)"
-msgstr ""
+msgstr "SQL æ?¥è¯¢ (å¯¹äº?ä»»ä½?ç±»å??)"
 
-#: src/query-druid.c:478
-msgid "SELECT query: targets"
-msgstr ""
+#: ../src/query-druid.c:427
+msgid "Query attributes"
+msgstr "æ?¥è¯¢å±?æ?§"
 
-#: src/query-druid.c:483
+#: ../src/query-druid.c:482
 msgid "Target selection:"
-msgstr ""
+msgstr "ç?®æ ?é??æ?©"
 
-#: src/query-druid.c:484
+#: ../src/query-druid.c:483
 msgid "select the tables and views from which data will be extracted."
-msgstr ""
+msgstr "é??æ?©ä»?ä¸æ??å??æ?°æ?®ç??è¡¨å??è§?å?¾ã??"
 
-#: src/query-druid.c:498
-#, fuzzy
+#: ../src/query-druid.c:495
 msgid "Tables / Views:"
-msgstr "è¡¨å??è§?å?¾"
+msgstr "è¡¨å??è§?å?¾ï¼?"
 
-#: src/query-druid.c:508
-#, fuzzy
+#: ../src/query-druid.c:504
 msgid "Query targets:"
-msgstr "æ?¥è¯¢æ??ä½?ï¼?"
+msgstr "æ?¥è¯¢ç?®æ ?ï¼?"
 
-#: src/query-druid.c:710
-msgid "SELECT query: joins"
-msgstr ""
+#: ../src/query-druid.c:581
+msgid "SELECT query: targets"
+msgstr "SELECT æ?¥è¯¢ï¼?ç?®æ ?"
 
-#: src/query-druid.c:715
+#: ../src/query-druid.c:702
 msgid "Targets' joins:"
-msgstr ""
+msgstr "ç?®æ ?ç??è¿?æ?¥ï¼?"
 
-#: src/query-druid.c:716
+#: ../src/query-druid.c:703
 msgid ""
 "choose the joins that should be taken into account in the query (most of the "
 "time there are not any target not joined to any other target)"
 msgstr ""
 
-#: src/query-druid.c:753
-msgid "SELECT query: fields"
-msgstr ""
+#: ../src/query-druid.c:727
+msgid "SELECT query: joins"
+msgstr "SELECT æ?¥è¯¢ï¼?è¿?æ?¥"
 
-#: src/query-druid.c:758
+#: ../src/query-druid.c:749
 msgid "Fields selection:"
-msgstr ""
+msgstr "å?æ®µé??æ?©ï¼?"
 
-#: src/query-druid.c:759
+#: ../src/query-druid.c:750
 msgid ""
 "select the fields from the already selected targets. Alternatively fields "
 "can be entered as textual expressions for functions, constants, etc."
 msgstr ""
+"ä»?å·²ç»?é??æ?©ç??ç?®æ ?ä¸é??æ?©å?æ®µã??æ??è??ï¼?å?æ®µå?¯ä»¥ä½?ä¸ºå?½æ?°ã??å¸¸é??ç?ç??æ??æ?¬è¡¨è¾¾å¼?æ?¥è¾?"
+"å?¥ã??"
 
-#: src/query-druid.c:774
+#: ../src/query-druid.c:763
 msgid "Possible fields:"
-msgstr ""
+msgstr "å?¯è?½ç??å?æ®µï¼?"
 
-#: src/query-druid.c:784
-#, fuzzy
+#: ../src/query-druid.c:772
 msgid "Query fields:"
-msgstr "æ?¥è¯¢"
+msgstr "æ?¥è¯¢å?æ®µï¼?"
 
-#: src/query-druid.c:794
-#, fuzzy
+#: ../src/query-druid.c:781
 msgid ""
 "Textual\n"
 "expression:"
-msgstr "æ??å?å?ºå??ä»£è¡¨"
+msgstr ""
+"æ??æ?¬\n"
+"è¡¨è¾¾å¼?ï¼?"
+
+#: ../src/query-druid.c:878
+msgid "SELECT query: fields"
+msgstr "SELECT æ?¥è¯¢ï¼?å?æ®µ"
 
-#: src/query-druid.c:970 src/query-druid.c:979 src/query-fields-menu.c:509
-#: src/query-fields-menu.c:518
+#: ../src/query-druid.c:950 ../src/query-druid.c:959
+#: ../src/query-fields-menu.c:516 ../src/query-fields-menu.c:525
 msgid "Error parsing/analysing field expression:"
-msgstr ""
+msgstr "è§£æ??å??å??æ??å?æ®µè¡¨è¾¾å¼?å?ºé??ï¼?"
 
-#: src/query-druid.c:971 src/query-druid.c:980 src/query-editor.c:626
-#: src/query-editor.c:635 src/query-fields-editor.c:453
-#: src/query-fields-editor.c:462 src/query-fields-menu.c:510
-#: src/query-fields-menu.c:519
+#: ../src/query-druid.c:951 ../src/query-druid.c:960 ../src/query-editor.c:650
+#: ../src/query-editor.c:659 ../src/query-fields-editor.c:495
+#: ../src/query-fields-editor.c:504 ../src/query-fields-menu.c:517
+#: ../src/query-fields-menu.c:526
 msgid "while parsing"
-msgstr ""
-
-#: src/query-druid.c:1056
-msgid "SELECT query: condition and ordering"
-msgstr ""
+msgstr "è§£æ??æ?¶"
 
-#: src/query-druid.c:1061
+#: ../src/query-druid.c:1036
 msgid "Selection condition and ordering:"
-msgstr ""
+msgstr "é??æ?©æ?¡ä»¶å??é¡ºåº?ï¼?"
 
-#: src/query-druid.c:1062
+#: ../src/query-druid.c:1037
 msgid ""
 "Enter the conditions to apply on the selected rows to filter the final rows, "
 "and the ordering"
-msgstr ""
+msgstr "è¾?å?¥æ?¡ä»¶ä»¥æ??äº¤å?°é??ä¸ç??å??ä¸?ä»¥è¿?æ»¤æ??ç»?è¡?å¹¶æ??åº?"
 
-#: src/query-druid.c:1086
-msgid "SELECT query: parameters definition"
-msgstr ""
+#: ../src/query-druid.c:1051
+msgid "SELECT query: condition and ordering"
+msgstr "SELECT æ?¥è¯¢ï¼?æ?¡ä»¶å??æ??åº?"
 
-#: src/query-druid.c:1105
-msgid "SELECT query: ready"
-msgstr ""
+#: ../src/query-druid.c:1070
+msgid "SELECT query: parameters definition"
+msgstr "SELECT æ?¥è¯¢ï¼?å??æ?°å®?ä¹?"
 
-#: src/query-druid.c:1106
+#: ../src/query-druid.c:1079
 msgid "The selection query is now ready."
-msgstr ""
+msgstr "é??æ?©æ?¥è¯¢å·²ç»?å°±ç»ªã??"
 
-#: src/query-druid.c:1127
-msgid "SQL statement Query"
-msgstr ""
+#: ../src/query-druid.c:1082
+msgid "Query: ready"
+msgstr "æ?¥è¯¢ï¼?å°±ç»ª"
 
-#: src/query-druid.c:1131
+#: ../src/query-druid.c:1102
 msgid "Enter the SQL statement representing the query:"
-msgstr ""
+msgstr "è¾?å?¥è¡¨ç¤ºæ?¥è¯¢ç?? SQL è¯å?¥ï¼?"
 
-#: src/query-druid.c:1147
+#: ../src/query-druid.c:1120
 msgid "Test query validity"
-msgstr ""
+msgstr "æµ?è¯?æ?¥è¯¢ç??æ??æ??æ?§"
+
+#: ../src/query-druid.c:1127
+msgid "SQL statement Query"
+msgstr "SQL è¯å?¥æ?¥è¯¢"
 
-#: src/query-druid.c:1167 src/query-druid.c:1171
+#: ../src/query-druid.c:1149 ../src/query-druid.c:1153
 msgid "Parsing/analyzing error:"
-msgstr ""
+msgstr "æ£å?¨è§£æ??å??å??æ??é??è¯¯ï¼?"
 
-#: src/query-druid.c:1172
+#: ../src/query-druid.c:1154
 msgid "The query has an error"
-msgstr ""
+msgstr "æ?¥è¯¢æ??ä¸?ä¸ªé??è¯¯"
 
-#: src/query-druid.c:1184
+#: ../src/query-druid.c:1166
 msgid "No error parsing and analyzing the query"
-msgstr ""
-
-#: src/query-druid.c:1209
-msgid "To be implemented"
-msgstr ""
+msgstr "è§£æ??å??å??æ??æ?¥è¯¢æ²¡æ?? "
 
-#: src/query-druid.c:1213
-msgid "This functionnality is not yet implemented"
-msgstr ""
-
-#: src/query-editor.c:198
-#, fuzzy
+#: ../src/query-editor.c:208
 msgid "Query attributes:"
-msgstr "æ?¥è¯¢æ??ä½?ï¼?"
+msgstr "æ?¥è¯¢å±?æ?§ï¼?"
 
-#: src/query-editor.c:242
+#: ../src/query-editor.c:252
 msgid "SQL"
-msgstr ""
+msgstr "SQL"
 
-#: src/query-editor.c:264
+#: ../src/query-editor.c:274
 msgid "SQL statement representing the query:"
-msgstr ""
+msgstr "ä»£è¡¨æ?¥è¯¢ç?? SQL è¯å?¥ï¼?"
 
-#: src/query-editor.c:265
+#: ../src/query-editor.c:275
 msgid "Click on the \"Apply\" button to validate any modification in the text"
-msgstr ""
+msgstr "ç?¹å?»â??åº?ç?¨â??æ??é?®æ?¯æ??æ?¬ä¸ç??æ??æ??ä¿®æ?¹é?½ç??æ??"
 
-#: src/query-editor.c:322
+#: ../src/query-editor.c:332
 msgid "Query targets and their joining rules:"
-msgstr ""
+msgstr "æ?¥è¯¢ç?®æ ?å??å®?ä»¬ç??è¿?æ?¥è§?å??ï¼?"
 
-#: src/query-editor.c:358
-#, fuzzy
+#: ../src/query-editor.c:376
 msgid "Query fields and their properties:"
-msgstr "è¡¨å??ä¸?å??ç??å±?æ?§ï¼?"
+msgstr "æ?¥è¯¢å?æ®µå??å?¶å±?æ?§ï¼?"
 
-#: src/query-editor.c:381
-#, fuzzy
+#: ../src/query-editor.c:399
 msgid "Other properties:"
-msgstr "æ?¥è¯¢æ??ä½?ï¼?"
+msgstr "å?¶å®?å±?æ?§ï¼?"
 
-#: src/query-editor.c:401
+#: ../src/query-editor.c:419
 msgid "Global WHERE filter rule:"
-msgstr ""
+msgstr "å?¨å±? WHERE è¿?æ»¤å?¨è§?å??ï¼?"
 
-#: src/query-editor.c:427
-#, fuzzy
+#: ../src/query-editor.c:445
 msgid "Query parameters:"
-msgstr "æ?¥è¯¢æ??ä½?ï¼?"
+msgstr "æ?¥è¯¢å??æ?°ï¼?"
 
-#: src/query-editor.c:545
+#: ../src/query-editor.c:564
 msgid "Error (no details available)."
-msgstr ""
+msgstr "é??è¯¯ (æ²¡æ??å?¯ç?¨ç»?è??)"
 
-#: src/query-editor.c:555
+#: ../src/query-editor.c:574
 msgid "SQL query analyse warning:"
-msgstr ""
+msgstr "SQL æ?¥è¯¢å??æ??è¦å??ï¼?"
 
-#: src/query-editor.c:556
+#: ../src/query-editor.c:575
 msgid ""
 "This prevents extra treatments, such as graphical edition of this query, "
 "which will be considered as a SQL statement specific to the connected "
 "database."
 msgstr ""
+"è¿?é?»æ¢é¢?å¤?ç??å¤?ç??ï¼?ä¾?å¦?æ¤æ?¥è¯¢ç??å?¾å??ç??ï¼?è¿?å°?è¢«è§?ä¸ºä¸?ä¸ºå·²è¿?æ?¥ç??æ?°æ?®åº?ç?? SQL è¯"
+"å?¥ã??"
 
-#: src/query-editor.c:559
-msgid "Do you still want to use that SQL for the query ?"
-msgstr ""
+#: ../src/query-editor.c:578
+msgid "Do you still want to use that SQL for the query?"
+msgstr "æ?¨ä»?ç?¶æ?³è¦?ä½¿ç?¨é?£ä¸ª SQL è¯å?¥æ?¥è¯¢ï¼?"
 
-#: src/query-editor.c:625 src/query-editor.c:634
+#: ../src/query-editor.c:649 ../src/query-editor.c:658
 msgid "Error parsing/analysing WHERE expression:"
-msgstr ""
+msgstr "è§£æ??å??å??æ?? WHERE è¡¨è¾¾å¼?æ?¶å?ºé??ï¼?"
 
-#: src/query-fields-editor.c:241
+#: ../src/query-fields-editor.c:244
 msgid "Field"
-msgstr "å??"
+msgstr "å?æ®µ"
 
-#: src/query-fields-editor.c:253
+#: ../src/query-fields-editor.c:257
 msgid "Shown & alias"
 msgstr ""
 
-#: src/query-fields-editor.c:273
-#, fuzzy
+#: ../src/query-fields-editor.c:280
 msgid "Filter"
-msgstr "æ??ä»¶(_F)"
+msgstr "è¿?æ»¤å?¨"
 
-#: src/query-fields-editor.c:289
+#: ../src/query-fields-editor.c:298
 msgid "Ordering"
-msgstr ""
+msgstr "æ£å?¨æ??åº?"
 
-#: src/query-fields-editor.c:452 src/query-fields-editor.c:461
+#: ../src/query-fields-editor.c:494 ../src/query-fields-editor.c:503
 msgid "Error parsing/analysing condition expression:"
-msgstr ""
+msgstr "è§£æ??å??æ??æ?¡ä»¶è¡¨è¾¾å¼?å?ºé??ï¼?"
 
 #. add a menu item for field creation from a textual expression
-#: src/query-fields-menu.c:333
+#: ../src/query-fields-menu.c:333
 msgid "From expression..."
-msgstr ""
+msgstr "ä»?è¡¨è¾¾å¼?..."
 
 #. add a menu item for "target.*" field creation
-#: src/query-fields-menu.c:406
+#: ../src/query-fields-menu.c:406
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: src/query-fields-menu.c:466
+#: ../src/query-fields-menu.c:473
 msgid "Add a query field from an expression"
-msgstr ""
+msgstr "ä»?ä¸?ä¸ªè¡¨è¾¾å¼?æ·»å? ä¸?ä¸ªæ?¥è¯¢å?æ®µ"
 
-#: src/query-fields-menu.c:477
-#, fuzzy
+#: ../src/query-fields-menu.c:484
 msgid "Textual expression:"
-msgstr "æ??å?å?ºå??ä»£è¡¨"
+msgstr "æ??å?è¡¨è¾¾å¼?ï¼?"
 
-#: src/query-fields-menu.c:478
+#: ../src/query-fields-menu.c:485
 msgid ""
 "The following expression will be analysed to create\n"
 "a new field in the query"
-msgstr ""
+msgstr "å¦?ä¸?è¡¨è¾¾å¼?å°?è¢«å??æ??ä¸ºå?¨æ?¥è¯¢ä¸å??å»ºä¸?ä¸ªæ?°å?æ®µ"
 
-#: src/query-params-editor.c:283
+#: ../src/query-params-editor.c:284
 msgid "Name"
 msgstr "å??ç§°"
 
-#: src/query-params-editor.c:297
-#, fuzzy
+#: ../src/query-params-editor.c:298
 msgid "Parameter?"
-msgstr "å??æ?°"
+msgstr "å??æ?°ï¼?"
 
-#: src/query-params-editor.c:312
+#: ../src/query-params-editor.c:313
 msgid "Value"
 msgstr "å?¼"
 
-#: src/query-params-editor.c:326
+#: ../src/query-params-editor.c:327 ../src/ws-queries.c:303
 msgid "Description"
 msgstr "æ??è¿°"
 
-#: src/query-params-editor.c:342
-#, fuzzy
+#: ../src/query-params-editor.c:343
 msgid "Data type"
 msgstr "æ?°æ?®ç±»å??"
 
-#: src/query-params-editor.c:355
-#, fuzzy
+#: ../src/query-params-editor.c:356
 msgid "NULL Ok?"
-msgstr "NULL å?¯ä»¥"
+msgstr "NULL å?¯ä»¥å??ï¼?"
 
-#: src/query-params-editor.c:498
+#: ../src/query-params-editor.c:508
 #, c-format
 msgid "Error: data type '%s' does not exist"
+msgstr "é??è¯¯ï¼?æ?°æ?®ç±»å??â??%sâ??ä¸?å?å?¨"
+
+#: ../src/utils.c:66
+msgid "Please fill in the following information."
+msgstr "è¯·å¡«å??å¦?ä¸?ä¿¡æ?¯ã??"
+
+#: ../src/utils.c:77
+msgid "Provider selection"
+msgstr "æ??ä¾?è??é??æ?©"
+
+#: ../src/utils.c:91
+msgid "Provider:"
+msgstr "æ??ä¾?è??ï¼?"
+
+#: ../src/utils.c:123
+msgid ""
+"The provider associated to this connection\n"
+"does not support this operation"
+msgstr "ä¸?æ¤è¿?æ?¥æ??å?³ç??æ??ä¾?è??ä¸?æ?¯æ??æ¤æ??ä½?"
+
+#: ../src/utils.c:132 ../src/utils.c:276
+#, c-format
+msgid ""
+"Could not get the information required to perform that operation:\n"
+"%s"
 msgstr ""
+"æ? æ³?è?·å??æ?§è¡?æ¤æ??ä½?æ??é??è¦?ç??ä¿¡æ?¯ï¼?\n"
+"%s"
+
+#: ../src/utils.c:133 ../src/utils.c:189 ../src/utils.c:277
+#: ../src/workspace-window.c:151 ../src/workspace-window.c:161
+#: ../src/workspace-window.c:296 ../src/workspace-window.c:741
+#: ../src/ws-queries.c:766
+msgid "No detail"
+msgstr "æ²¡æ??ç»?è??"
+
+#: ../src/utils.c:188
+msgid "Could not perform operation"
+msgstr "æ? æ³?æ?§è¡?æ??ä½?"
+
+#: ../src/utils.c:241
+msgid "Internal error: can't instantiate a provider object"
+msgstr "å??é?¨é??è¯¯ï¼?æ? æ³?å®?ä¾?å??ä¸?ä¸ªæ??ä¾?è??å¯¹è±¡"
 
-#: src/workspace-page.c:175
+#: ../src/utils.c:270
+msgid "Selected provider does not support this operation"
+msgstr "é??æ?©ç??æ??ä¾?è??ä¸?æ?¯æ??æ¤æ??ä½?"
+
+#: ../src/workspace-page.c:208
 #, c-format
 msgid ""
 "This feature (%s)\n"
@@ -392,213 +460,360 @@ msgid ""
 "\n"
 "In %s, %s(), line %d"
 msgstr ""
+"æ¤å??è?½(%s)\n"
+"å°?æ?ªå®?ç?°\n"
+"\n"
+"å?¨ %sï¼?%s()ï¼?ç¬¬ %d è¡?"
 
-#: src/workspace-page.c:180
+#: ../src/workspace-page.c:213
 #, c-format
 msgid ""
 "This feature is not yet implemented\n"
 "\n"
 "In %s, %s(), line %d"
 msgstr ""
+"æ¤å??è?½å°?æ?ªå®?ç?°\n"
+"\n"
+"å?¨ %sï¼?%s()ï¼?ç¬¬ %d è¡?"
+
+#: ../src/workspace-window.c:122
+#, c-format
+msgid ""
+"<b>A transaction has been started on the %s connection.</b>\n"
+"\n"
+"if it is not committed, any change since the beginning of the transaction "
+"will be lost. \n"
+"\n"
+"<u>Rollback</u> the transaction to cancel any change made since the "
+"transaction was started, <u>commit</u> the transaction to save those "
+"changes, or <u>ignore</u> the transaction to let the DBMS handle the "
+"transaction (this usually leads to lose any change). What do you want to do?"
+msgstr ""
+"<b>å·²ç»?å?¨ %s è¿?æ?¥ä¸?å?¯å?¨äº?ä¸?ä¸ªæ??å?¡ã??</b>\n"
+"\n"
+"å¦?æ??å?¶æ²¡æ??æ??äº¤ï¼?ä»?è¿?ä¸ªäº?å?¡å¼?å§?ç??æ?´æ?¹é?½å°?ä¸¢å¤±ã??\n"
+"\n"
+"<u>å??æ»?</u> å??æ¶?æ¤äº?å?¡å¼?å§?å??ç??æ??æ??æ?´æ?¹ç??äº?å?¡ï¼? <u>æ??äº¤</u> ä¿?å?é?£äº?æ?´æ?¹ç??äº?"
+"å?¡ï¼?æ?? <u>å¿½ç?¥</u> è®© DBMS å¤?ç??è¿?äº?äº?å?¡ç??äº?å?¡(è¿?é??å¸¸é? æ??ä¸¢å¤±å?¨é?¨æ?´æ?¹)ã??æ?¨æ?³"
+"è¦?æ??ä¹?å??ï¼?"
+
+#: ../src/workspace-window.c:134
+msgid "Rollback transaction"
+msgstr "å??æ»?äº?å?¡"
+
+#: ../src/workspace-window.c:135
+msgid "Commit transaction"
+msgstr "æ??äº¤äº?å?¡"
+
+#: ../src/workspace-window.c:136
+msgid "Ignore transaction"
+msgstr "å¿½ç?¥äº?å?¡"
+
+#: ../src/workspace-window.c:148
+#, c-format
+msgid ""
+"<b>Could not rollback current transaction:</b>\n"
+"%s\n"
+"\n"
+"What do you want to do?"
+msgstr ""
+"<b>æ? æ³?å??æ»?å½?å??äº?å?¡ï¼?</b>\n"
+"%s\n"
+"\n"
+"æ?¨æ?³è¦?å??ä»?ä¹?ï¼?"
 
-#: src/workspace-window.c:239
-msgid "Mergeant"
-msgstr "Mergeant"
+#: ../src/workspace-window.c:158
+#, c-format
+msgid ""
+"<b>Could not commit current transaction:</b>\n"
+"%s\n"
+"\n"
+"What do you want to do?"
+msgstr ""
+"<b>æ? æ³?æ??äº¤å½?å??äº?å?¡ï¼?</b>\n"
+"%s\n"
+"\n"
+"æ?¨æ?³è¦?å??ä»?ä¹?ï¼?"
+
+#: ../src/workspace-window.c:167
+msgid "Close anyway"
+msgstr "å??æ??è¦?å?³é?"
+
+#: ../src/workspace-window.c:168
+msgid "Don't close this workspace window"
+msgstr "ä¸?è¦?å?³é?æ¤å·¥ä½?å?ºçª?å?£"
+
+#. dialog
+#: ../src/workspace-window.c:224
+msgid "Transactions management"
+msgstr "äº?å?¡ç®¡ç??"
+
+#: ../src/workspace-window.c:255
+msgid "Database creation requires that first a database provider be selected."
+msgstr "å??å»ºæ?°æ?®åº?è¦?æ±?é¦?å??é??æ?©ä¸?ä¸ªæ?°æ?®æ??ä¾?è??ã??"
 
-#: src/workspace-window.c:241
+#: ../src/workspace-window.c:256
 msgid ""
-"A Database admin tool for any SQL database accessible with the GNOME-DB "
-"module."
-msgstr "ä¸?ä¸ªæ?°æ?®åº?ç®¡ç??å·¥å?·ï¼?é??ç?¨äº?ä»»ä½?å?¯ç?¨ gnome-db æ¨¡å??è®¿é?®ç?? SQL æ?°æ?®åº?ã??"
+"The 'SQLite' provider allows you to create a database stored in a single "
+"file\n"
+"and does not require a database server to be set up."
+msgstr ""
+"æ??ä¾?è??â??SQLiteâ??å??è®¸æ?¨å??å»ºä¸?ä¸ªå?å?¨å?¨å??ä¸ªæ??ä»¶ä¸ç??æ?°æ?®åº?\n"
+"å¹¶ä¸?ä¸?è¦?æ±?è®¾ç½®ä¸?ä¸ªæ?°æ?®åº?æ??å?¡å?¨ã??"
+
+#: ../src/workspace-window.c:260
+msgid "Create a database"
+msgstr "å??å»ºæ?°æ?®åº?"
 
-#: src/workspace-window.c:285
+#: ../src/workspace-window.c:272
+msgid "Delete a database"
+msgstr "å? é?¤æ?°æ?®åº?"
+
+#: ../src/workspace-window.c:273
+msgid ""
+"Database destruction requires that first a database provider be selected."
+msgstr "æ?°æ?®åº?è§£æ??è¦?æ±?é¦?å??é??æ?©ä¸?ä¸ªæ?°æ?®åº?æ??ä¾?è??ã??"
+
+#: ../src/workspace-window.c:295
+msgid "Could not find the 'gnome-database-properties' program"
+msgstr "æ? æ³?æ?¾å?° gnome-database-properties ç¨?åº?"
+
+#. dialog
+#: ../src/workspace-window.c:315
+msgid "SQL console"
+msgstr "SQL æ?§å?¶å?°"
+
+#: ../src/workspace-window.c:333
+msgid "SQL Console (type \\? + ENTER for help)\n"
+msgstr "SQL æ?§å?¶å?°(è¾?å?¥ \\? + ENTER è?·å??å¸®å?©)\n"
+
+#: ../src/workspace-window.c:417
+msgid "Database services for the GNOME Desktop"
+msgstr "GNOME æ¡?é?¢ç??æ?°æ?®æ??å?¡"
+
+#: ../src/workspace-window.c:493
 msgid "Metadata synchronisation"
 msgstr "å??æ¥å??æ?°æ?®"
 
-#: src/workspace-window.c:300
+#: ../src/workspace-window.c:499
+msgid "Reading database's meta data, please wait..."
+msgstr "æ£å?¨è¯»å??æ?°æ?®ç??å??æ?°æ?®ï¼?è¯·ç¨?å??..."
+
+#: ../src/workspace-window.c:510
 #, c-format
 msgid ""
-"Error updating server metadata:\n"
-"%s"
+"Error updating Server metadata:\n"
+"%s\n"
 msgstr ""
-"å?¨æ?´æ?°æ??å?¡å?¨å??æ?°æ?®å?ºç?°é??è¯¯ï¼?\n"
-"%s"
+"å?¨æ?´æ?°æ??å?¡å?¨å??æ?°æ?®æ?¶å?ºé??ï¼?\n"
+"%s\n"
 
-#: src/workspace-window.c:308
+#: ../src/workspace-window.c:740
 #, c-format
 msgid ""
-"Error updating database metadata:\n"
-"%s"
+"Error Opening connection:\n"
+"%s\n"
 msgstr ""
-"å?¨æ?´æ?°æ?°æ?®åº?å??æ?°æ?®å?ºç?°é??è¯¯ï¼?\n"
-"%s"
+"æ??å¼?è¿?æ?¥æ?¶å?ºé??ï¼?\n"
+"%s\n"
+
+#: ../src/workspace-window.c:837
+msgid "Opening connection"
+msgstr "æ£å?¨æ??å¼?è¿?æ?¥"
+
+#: ../src/workspace-window.c:838
+msgid "The connection to the data source is now being opened."
+msgstr "å?°æ?°æ?®æº?ç??è¿?æ?¥å°?æ?ªæ??å¼?ã??"
 
 #. dialog to choose the connection
-#: src/workspace-window.c:349
+#: ../src/workspace-window.c:876
 msgid "Connect"
 msgstr "è¿?æ?¥"
 
-#: src/workspace-window.c:406
-#, c-format
-msgid ""
-"<b><big>Failed loading data dictionnary</big></b>\n"
-"<small>The previously saved data dictionnary for this connection can't be "
-"loaded because it contains errors:\n"
-"%s</small>\n"
-"\n"
-"Do you want to force a synchronization with the database dictionnary now?\n"
-"\n"
-"<small><u>Warning:</u> if you answer 'Yes', all the queries, etc. defined "
-"will be lost; answering 'No' allows you try to fix the error</small>"
-msgstr ""
-
-#: src/ws-datatypes.c:225
+#: ../src/ws-datatypes.c:227
 msgid "Please select a data type from the list on the left"
-msgstr ""
+msgstr "è¯·ä»?å·¦è¾¹ç??å??è¡¨ä¸é??æ?©ä¸?ä¸ªæ?°æ?®ç±»å??"
 
-#: src/ws-datatypes.c:234 src/ws-dbrels.c:243 src/ws-queries.c:256
-#: src/ws-tables.c:244
-#, fuzzy
+#: ../src/ws-datatypes.c:236 ../src/ws-dbrels.c:297 ../src/ws-tables.c:345
 msgid "<b>Description:</b>"
-msgstr "æ??è¿°ï¼?"
+msgstr "<b>æ??è¿°ï¼?</b>"
 
-#: src/ws-datatypes.c:253
-#, fuzzy
+#: ../src/ws-datatypes.c:255
+msgid "<b>Synonyms:</b>"
+msgstr "<b>å?«å??ï¼?</b>"
+
+#: ../src/ws-datatypes.c:274
 msgid "<b>Select a filter option:</b>"
-msgstr "é??æ?©ä¸?ä¸ªè¿?æ»¤å?¨ç??é??é¡¹ï¼?"
+msgstr "<b>é??æ?©ä¸?ä¸ªè¿?æ»¤å?¨ç??é??é¡¹ï¼?</b>"
 
-#: src/ws-datatypes.c:269
+#: ../src/ws-datatypes.c:290
 msgid "Functions returning this data type"
 msgstr "è¿?å??è¿?ä¸ªæ?°æ?®ç±»å??ç??å?½æ?°"
 
-#: src/ws-datatypes.c:277
+#: ../src/ws-datatypes.c:298
 msgid "Functions using this data type"
 msgstr "è¿?ç?¨è¿?ä¸ªæ?°æ?®ç±»å??ç??å?½æ?°"
 
-#: src/ws-datatypes.c:285
+#: ../src/ws-datatypes.c:306
 msgid "Aggregates using this data type"
 msgstr "è¿?ç?¨è¿?ä¸ªæ?°æ?®ç±»å??ç??å??å¹¶"
 
-#: src/ws-datatypes.c:293
-#, fuzzy
+#: ../src/ws-datatypes.c:314
 msgid "<b>Result of filter:</b>"
-msgstr "è¿?æ»¤ç??ç»?æ??ï¼?"
+msgstr "<b>è¿?æ»¤ç»?æ??ï¼?</b>"
 
-#: src/ws-datatypes.c:504
+#: ../src/ws-datatypes.c:551
+#, c-format
 msgid "Data types"
 msgstr "æ?°æ?®ç±»å??"
 
-#: src/ws-datatypes.c:523
-#, fuzzy
+#: ../src/ws-datatypes.c:570
 msgid "No data type selected"
-msgstr "æ? è¡¨æ ¼è¢«é??"
+msgstr "æ²¡æ??é??æ?©æ?°æ?®ç±»å??"
 
-#: src/ws-datatypes.c:545
-#, fuzzy
+#: ../src/ws-datatypes.c:592
 msgid "Types"
 msgstr "ç±»å??"
 
-#: src/ws-dbrels.c:233
+#: ../src/ws-dbrels.c:287
 msgid ""
 "Please select a graph from the list on the left,\n"
 "or create a new one using the 'Add' button below."
 msgstr ""
+"è¯·ä»?å·¦è¾¹ç??å??è¡¨ä¸é??æ?©ä¸?ä¸ªå?¾ï¼?\n"
+"æ??è??ä½¿ç?¨ä¸?è¾¹ç??â??æ·»å? â??æ??é?®å??å»ºä¸?ä¸ªæ?°ç??ã??"
 
-#: src/ws-dbrels.c:262
-#, fuzzy
+#: ../src/ws-dbrels.c:316
 msgid "<b>Relations:</b>"
-msgstr "<b>å??ï¼?</b>"
+msgstr "<b>å?³ç³»ï¼?</b>"
 
-#: src/ws-dbrels.c:412
-#, fuzzy
+#: ../src/ws-dbrels.c:384
+msgid "Automatic layout"
+msgstr "è?ªå?¨å¸?å±?"
+
+#: ../src/ws-dbrels.c:504
 msgid "Relations view properties"
-msgstr "è¡¨å??ä¸?å??ç??å±?æ?§ï¼?"
+msgstr "å?³ç³»è§?å?¾å±?æ?§"
 
-#: src/ws-dbrels.c:461
+#: ../src/ws-dbrels.c:553
 msgid ""
 "Enter the name and description for this database's relations representation."
 msgstr ""
 
-#: src/ws-dbrels.c:490
+#: ../src/ws-dbrels.c:585
 #, c-format
 msgid "Do you want to delete the '%s' graph?"
-msgstr ""
+msgstr "ç??ç??æ?³è¦?å? é?¤â??%sâ??å?¾ï¼?"
 
-#: src/ws-dbrels.c:532
-#, fuzzy
+#: ../src/ws-dbrels.c:588
+msgid "Do you want to delete the graph <no name>?"
+msgstr "ç??ç??æ?³è¦?å? é?¤å?¾ <æ? å??>ï¼?"
+
+#: ../src/ws-dbrels.c:634
+#, c-format
 msgid "Database Relations"
-msgstr "æ?°æ?®åº?ç»?ä»¶"
+msgstr "æ?°æ?®åº?å?³ç³»"
 
-#: src/ws-dbrels.c:551
-#, fuzzy
+#: ../src/ws-dbrels.c:653
 msgid "No database relation selected"
-msgstr "æ? è¡¨æ ¼è¢«é??"
+msgstr "æ²¡æ??é??æ?©æ?°æ?®åº?å?³ç³»"
 
-#: src/ws-dbrels.c:573
+#: ../src/ws-dbrels.c:675
 msgid "Relations"
-msgstr ""
+msgstr "å?³ç³»"
 
-#: src/ws-queries.c:241
+#: ../src/ws-queries.c:288
 msgid ""
 "Please select a query from the list on the left,\n"
 "or create a new one using the 'Add' button below."
 msgstr ""
+"è¯·ä»?å·¦è¾¹ç??å??è¡¨ä¸é??æ?©ä¸?ä¸ªæ?¥è¯¢ï¼?\n"
+"æ??è??ä½¿ç?¨ä¸?è¾¹ç??â??æ·»å? â??æ??é?®å??å»ºä¸?ä¸ªæ?°ç??ã??"
 
-#: src/ws-queries.c:275
-msgid "<b>SQL statement:</b>"
-msgstr ""
+#: ../src/ws-queries.c:329
+msgid "SQL statement"
+msgstr "SQL è¯å?¥"
 
-#: src/ws-queries.c:292 src/ws-queries.c:326
-msgid ""
-"<small>For information only, to edit, click on the \"Edit\" button.</small>"
-msgstr ""
-
-#: src/ws-queries.c:309
-#, fuzzy
-msgid "<b>Query parameters:</b>"
-msgstr "<b>å®?æ?´æ?§è§?å??:</b>"
-
-#: src/ws-queries.c:349
-#, fuzzy
-msgid "Edit"
-msgstr "ç¼?è¾?(_E)"
+#: ../src/ws-queries.c:348 ../src/ws-queries.c:387
+msgid "For information only, to edit, click on the \"Edit\" button."
+msgstr "å?ªè?·å??ä¿¡æ?¯ï¼?è¦?ç¼?è¾?ï¼?è¯·ç?¹å?» â??ç¼?è¾?â?? æ??é?®ã??"
 
-#: src/ws-queries.c:369
-msgid "Execute"
-msgstr "æ?§è¡?"
+#: ../src/ws-queries.c:368
+msgid "Query parameters"
+msgstr "æ?¥è¯¢å??æ?°"
 
-#: src/ws-queries.c:413
-#, fuzzy
-msgid "New Query"
-msgstr "æ?¥è¯¢"
-
-#: src/ws-queries.c:428
-#, fuzzy, c-format
+#: ../src/ws-queries.c:478
+#, c-format
 msgid "Edition of query '%s'"
-msgstr "æ?¥è¯¢â??%sâ??ç??æ?§è¡?"
+msgstr "æ?¥è¯¢â??%sâ??ç??ç??æ?¬"
 
-#: src/ws-queries.c:448
+#: ../src/ws-queries.c:502
 #, c-format
 msgid "Do you want to delete the '%s' query?"
-msgstr ""
+msgstr "ç??ç??æ?³è¦?å? é?¤â??%sâ??æ?¥è¯¢ï¼?"
 
-#: src/ws-queries.c:483
-#, fuzzy
+#: ../src/ws-queries.c:539
 msgid "Values to be filled"
-msgstr "è¢«å±?é??å?¨ PK å??ç??å?¼"
+msgstr "è¦?å¡«å??ç??å?¼"
 
-#: src/ws-queries.c:484
+#: ../src/ws-queries.c:540
 msgid ""
 "<big><b>Required values:</b></big>\n"
 "<small>The following values are required to execute the query.</small>"
 msgstr ""
+"<big><b>è¦?æ±?ç??å?¼ï¼?</b></big>\n"
+"<small>è¦?æ?§è¡?æ?¥è¯¢ï¼?è¦?æ±?å¦?ä¸?å?¼ã??</small>"
+
+#: ../src/ws-queries.c:621
+msgid "Execute the following insertion query?"
+msgstr "æ?§è¡?å¦?ä¸?æ??å?¥æ?¥è¯¢ï¼?"
+
+#: ../src/ws-queries.c:625
+msgid "Execute the following update query?"
+msgstr "æ?§è¡?å¦?ä¸?æ?´æ?°æ?¥è¯¢ï¼?"
+
+#: ../src/ws-queries.c:629
+msgid "Execute the following deletion query?"
+msgstr "æ?§è¡?å¦?ä¸?å? é?¤æ?¥è¯¢ï¼?"
+
+#: ../src/ws-queries.c:646
+#, c-format
+msgid ""
+"<b><big>%s</big></b>\n"
+"<small>The preferences require a confirmation for the following query</"
+"small>\n"
+"\n"
+"%s"
+msgstr ""
+"<b><big>%s</big></b>\n"
+"<small>æ¤é¦?é??é¡¹è¦?æ±?å¯¹å¦?ä¸?æ?¥è¯¢ç??ä¸?æ¬¡ç¡®è®¤</small>\n"
+"\n"
+"%s"
 
-#: src/ws-queries.c:528
+#: ../src/ws-queries.c:699
+#, c-format
+msgid ""
+"The following error occurred while preparing the query:\n"
+"%s"
+msgstr ""
+"å??å¤?æ?¥è¯¢æ?¶å??ç??å¦?ä¸?é??è¯¯ï¼?\n"
+"%s"
+
+#: ../src/ws-queries.c:704
+#, c-format
+msgid "An unknown error occurred while preparing the query."
+msgstr "å??å¤?æ?¥è¯¢æ?¶å??ç??äº?ä¸?ä¸ªæ?ªç?¥é??è¯¯ã??"
+
+#: ../src/ws-queries.c:768
+msgid "Can't execute query:"
+msgstr "æ? æ³?æ?§è¡?æ?¥è¯¢ï¼?"
+
+#: ../src/ws-queries.c:797
 #, c-format
 msgid "Execution of query '%s'"
 msgstr "æ?¥è¯¢â??%sâ??ç??æ?§è¡?"
 
-#: src/ws-queries.c:567
+#: ../src/ws-queries.c:848
 #, c-format
 msgid ""
 "<b><big>Execute the following query ?</big></b>\n"
@@ -608,84 +823,184 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"<b><big>æ?§è¡?å¦?ä¸?æ?¥è¯¢ï¼?</big></b>\n"
+"<small>æ¤æ?¥è¯¢æ? æ³?è§£æ??ï¼? å®?å?¯è?½å??å?«ä¸?äº?ä¾?èµ?äº?ä½¿ç?¨ç??æ?°æ?®åº?ç±»å??ç??è¯æ³?æ??æ??æ³?ï¼?æ??"
+"è??å?¯è?½å??å?«é??è¯¯ã??</small>\n"
+"\n"
+"%s"
 
-#: src/ws-queries.c:615
-#, fuzzy
+#: ../src/ws-queries.c:893
 msgid "Execution results"
-msgstr "æ?¥è¯¢â??%sâ??ç??æ?§è¡?"
+msgstr "æ?§è¡?ç»?æ??"
 
-#: src/ws-queries.c:689
+#: ../src/ws-queries.c:973
 msgid "Non reported error"
 msgstr "æ²¡è¢«æ?¥å??ç??é??è¯¯"
 
-#: src/ws-queries.c:710 src/ws-queries.c:751
+#: ../src/ws-queries.c:994 ../src/ws-queries.c:1035
+#, c-format
 msgid "Queries"
 msgstr "æ?¥è¯¢"
 
-#: src/ws-queries.c:729
+#: ../src/ws-queries.c:1013
 msgid "No query selected"
 msgstr "æ? æ?¥è¯¢è¢«é??"
 
-#: src/ws-tables.c:230
+#: ../src/ws-tables.c:331
 msgid ""
-"Please select a table from the list on the left,\n"
+"Please select a table or view from the list on the left,\n"
 "or create a new one using the 'Add' button below."
 msgstr ""
+"è¯·å?¨å·¦è¾¹ç??å??è¡¨ä¸é??æ?©ä¸?ä¸ªè¡¨æ??è§?å?¾ï¼?\n"
+"æ??è??ä½¿ç?¨ä¸?è¾¹â??æ·»å? â??æ??é?®å??å»ºä¸?ä¸ªã??"
 
-#: src/ws-tables.c:256
+#: ../src/ws-tables.c:357
 msgid "<b>Fields:</b>"
-msgstr "<b>å??ï¼?</b>"
-
-#: src/ws-tables.c:281
-msgid "<b>Integrity rules:</b>"
-msgstr "<b>å®?æ?´æ?§è§?å??:</b>"
+msgstr "<b>å?æ®µï¼?</b>"
 
-#: src/ws-tables.c:340
-msgid "Contents"
-msgstr "ç?®å½?"
+#: ../src/ws-tables.c:383
+msgid "<b>Constraints and integrity rules:</b>"
+msgstr "<b>çº¦æ??æ?§å??å®?æ?´æ?§è§?å??ï¼?</b>"
 
-#: src/ws-tables.c:374
-#, fuzzy
-msgid "table creation"
-msgstr "è¡¨ç??æ??ä½?ï¼?"
+#: ../src/ws-tables.c:424
+msgid "<b>Field's display specifications</b>"
+msgstr "<b>å?æ®µæ?¾ç¤ºè§?å??</b>"
 
-#: src/ws-tables.c:380
-msgid "table removal"
+#: ../src/ws-tables.c:669
+#, c-format
+msgid ""
+"Data cannot be modified for the following reason:\n"
+"%s"
 msgstr ""
+"ç?±äº?å¦?ä¸?å??å? ï¼?æ?°æ?®æ? æ³?ä¿®æ?¹ï¼?\n"
+"%s"
+
+#: ../src/ws-tables.c:672
+msgid "Data cannot be modified"
+msgstr "æ?°æ?®ä¸?è?½ä¿®æ?¹"
 
-#: src/ws-tables.c:432
-#, fuzzy, c-format
-msgid "Contents of '%s'"
+#: ../src/ws-tables.c:678
+msgid "Data cannot be modified because it is a view's data"
+msgstr "æ?°æ?®ä¸?è?½ä¿®æ?¹ï¼?å? ä¸ºè¿?æ?¯ä¸?ä¸ªè§?å?¾ç??æ?°æ?®"
+
+#: ../src/ws-tables.c:685
+#, c-format
+msgid "Contents of view '%s'"
 msgstr "è§?å?¾â??%sâ??ç??å??å®¹"
 
-#: src/ws-tables.c:538
+#: ../src/ws-tables.c:687
+#, c-format
+msgid "Contents of table '%s'"
+msgstr "è¡¨â??%sâ??ç??å??å®¹"
+
+#: ../src/ws-tables.c:762
+msgid "Column"
+msgstr "å??"
+
+#: ../src/ws-tables.c:763
+msgid "Type"
+msgstr "ç±»å??"
+
+#: ../src/ws-tables.c:764
+msgid "Can be NULL"
+msgstr "å?¯ä»¥ä¸º NULL"
+
+#: ../src/ws-tables.c:766
+msgid "Comments"
+msgstr "æ³¨é??"
+
+#: ../src/ws-tables.c:794
 msgid "Primary key"
 msgstr "ä¸»é?¥"
 
-#: src/ws-tables.c:575
-msgid "Foreign key"
-msgstr "å¤?æ?¥é?¥"
+#: ../src/ws-tables.c:828 ../src/ws-tables.c:830
+#, c-format
+msgid "Foreign key on '%s'"
+msgstr "â??%sâ??ä¸?ç??å¤?æ?¥é?¥"
 
-#: src/ws-tables.c:615
-msgid "UNIQUE constraint"
-msgstr "UNIQUE é??å?¶"
+#: ../src/ws-tables.c:876
+msgid "Unique constraint"
+msgstr "å?¯ä¸?çº¦æ??"
 
-#: src/ws-tables.c:651
-#, fuzzy
+#: ../src/ws-tables.c:911
+#, c-format
 msgid "Tables and views"
 msgstr "è¡¨å??è§?å?¾"
 
-#: src/ws-tables.c:667
+#: ../src/ws-tables.c:931
 msgid "No table selected"
 msgstr "æ? è¡¨æ ¼è¢«é??"
 
-#: src/ws-tables.c:689
-#, fuzzy
+#: ../src/ws-tables.c:953
 msgid "Tables"
 msgstr "è¡¨"
 
-#~ msgid "No File"
-#~ msgstr "æ²¡æ??æ??ä»¶"
+#: ../src/ws-tables.c:1007
+msgid "Create a table"
+msgstr "å??å»ºæ?°è¡¨"
+
+#: ../src/ws-tables.c:1031
+msgid "Delete a table"
+msgstr "å? é?¤ä¸?ä¸ªè¡¨"
+
+#: ../src/ws-tables.c:1091
+msgid "Rename a table"
+msgstr "é??å?½å??ä¸?ä¸ªè¡¨"
+
+#: ../src/ws-tables.c:1118
+msgid "Add a column to a table"
+msgstr "å??è¡¨ä¸æ·»å? ä¸?å??"
+
+#: ../src/ws-tables.c:1151
+msgid "Delete a column from a table"
+msgstr "ä»?è¡¨ä¸å? é?¤ä¸?å??"
+
+#~ msgid "Documents"
+#~ msgstr "æ??æ¡£"
+
+#~ msgid "Mergeant"
+#~ msgstr "Mergeant"
+
+#~ msgid ""
+#~ "A Database admin tool for any SQL database accessible with the GNOME-DB "
+#~ "module."
+#~ msgstr "ä¸?ä¸ªæ?°æ?®åº?ç®¡ç??å·¥å?·ï¼?é??ç?¨äº?ä»»ä½?å?¯ç?¨ gnome-db æ¨¡å??è®¿é?®ç?? SQL æ?°æ?®åº?ã??"
+
+#~ msgid ""
+#~ "Error updating server metadata:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "å?¨æ?´æ?°æ??å?¡å?¨å??æ?°æ?®å?ºç?°é??è¯¯ï¼?\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error updating database metadata:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "å?¨æ?´æ?°æ?°æ?®åº?å??æ?°æ?®å?ºç?°é??è¯¯ï¼?\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "<b>Query parameters:</b>"
+#~ msgstr "<b>å®?æ?´æ?§è§?å??:</b>"
+
+#, fuzzy
+#~ msgid "Edit"
+#~ msgstr "ç¼?è¾?(_E)"
+
+#~ msgid "Execute"
+#~ msgstr "æ?§è¡?"
+
+#, fuzzy
+#~ msgid "New Query"
+#~ msgstr "æ?¥è¯¢"
+
+#, fuzzy
+#~ msgid "table creation"
+#~ msgstr "è¡¨ç??æ??ä½?ï¼?"
+
+#~ msgid "Foreign key"
+#~ msgstr "å¤?æ?¥é?¥"
 
 #~ msgid ""
 #~ "Error loading file '%s':\n"
@@ -720,13 +1035,6 @@ msgstr "è¡¨"
 #~ msgstr "é??æ?©ä¸?ä¸ªè¦?ä¿?å?ç??æ??ä»¶"
 
 #~ msgid ""
-#~ "Error updating Server metadata:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "å?¨æ?´æ?°æ??å?¡å?¨å??æ?°æ?®æ?¶å?ºé??ï¼?\n"
-#~ "%s\n"
-
-#~ msgid ""
 #~ "Error updating Database metadata:\n"
 #~ "%s\n"
 #~ msgstr ""
@@ -742,22 +1050,9 @@ msgstr "è¡¨"
 #~ "Gnome library support"
 #~ msgstr "è¯¥å??è?½è¢«ç¦?ç?¨å? ä¸ºlibgnomedb åº?æ²¡æ??å?? Gnome æ?¯æ??åº?ä¸?èµ·ç¼?è¯?"
 
-#~ msgid ""
-#~ "Error opening the connection '%s':\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "å?¨æ??å¼?è¿?æ?¥â??%sâ??æ?¶å?ºé??ï¼?\n"
-#~ "%s\n"
-
-#~ msgid "Select a data type:"
-#~ msgstr "é??æ?©ä¸?ä¸ªæ?°æ?®ç±»å??ï¼?"
-
 #~ msgid "Select a data type..."
 #~ msgstr "é??æ?©ä¸?ä¸ªæ?°æ?®ç±»å??..."
 
-#~ msgid "Select a table or field:"
-#~ msgstr "é??æ?©ä¸?ä¸ªè¡¨æ??å??ï¼?"
-
 #~ msgid "Edit contents"
 #~ msgstr "ç¼?è¾?å??å®¹"
 
@@ -773,9 +1068,6 @@ msgstr "è¡¨"
 #~ msgid "Field: "
 #~ msgstr "å??ï¼?"
 
-#~ msgid "Data type: "
-#~ msgstr "æ?°æ?®ç±»å??ï¼?"
-
 #~ msgid "Length: "
 #~ msgstr "é?¿åº¦ï¼?"
 
@@ -797,28 +1089,15 @@ msgstr "è¡¨"
 #~ msgid "Part of primary key"
 #~ msgstr "ä¸»é?¥ç??ä¸?é?¨å??"
 
-#~ msgid "Foreign key: "
-#~ msgstr "å¤?æ?¥é?¥ï¼?"
-
 #~ msgid "Part of foreign key"
 #~ msgstr "å¤?æ?¥é?¥ç??ä¸?é?¨å??"
 
-#~ msgid "Contents of table '%s'"
-#~ msgstr "è¡¨â??%sâ??ç??å??å®¹"
-
 #~ msgid "Use to modify"
 #~ msgstr "ç?¨ä½?ä¿®æ?¹"
 
 #~ msgid "Query rendered as SQL:"
 #~ msgstr "æ?¥è¯¢è¢«ç¼?è¯?ä¸º SQLï¼?"
 
-#~ msgid ""
-#~ "Execute the following modification query:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "æ?§è¡?ä¸?å??ä¿®æ?¹æ?¥è¯¢ï¼?\n"
-#~ "%s"
-
 #~ msgid "Usage: %s <filename.xml>\n"
 #~ msgstr "ç?¨é??ï¼? %s <filename.xml>\n"
 
@@ -860,9 +1139,6 @@ msgstr "è¡¨"
 #~ msgid "Mergeant application automation interface"
 #~ msgstr "Mergeant åº?ç?¨ç¨?åº?ç??è?ªå?¨å??æ?¥å?£"
 
-#~ msgid "Close this window"
-#~ msgstr "å?³é?è¿?ä¸ªçª?å?£"
-
 #~ msgid "Commit current transaction"
 #~ msgstr "æ??äº¤å½?å??äº?å?¡"
 
@@ -896,15 +1172,9 @@ msgstr "è¡¨"
 #~ msgid "_About Mergeant..."
 #~ msgstr "å?³äº? Mergeant(_A)..."
 
-#~ msgid "_Begin Transaction"
-#~ msgstr "å¼?å§?äº?å?¡(_B)"
-
 #~ msgid "_Close"
 #~ msgstr "å?³é?(_C)"
 
-#~ msgid "_Commit Transaction"
-#~ msgstr "æ??äº¤äº?å?¡(_C)"
-
 #~ msgid "_Delete"
 #~ msgstr "å? é?¤(_D)"
 
@@ -914,9 +1184,6 @@ msgstr "è¡¨"
 #~ msgid "_New"
 #~ msgstr "æ?°å»º(_N)"
 
-#~ msgid "_Rollback Transaction"
-#~ msgstr "å??æ»?äº?å?¡(_R)"
-
 #~ msgid "Database"
 #~ msgstr "æ?°æ?®åº?"
 
@@ -1332,9 +1599,6 @@ msgstr "è¡¨"
 #~ msgid "Not NULL?"
 #~ msgstr "ä¸?æ?¯ NULLï¼?"
 
-#~ msgid "Default value"
-#~ msgstr "é»?è®¤å?¼"
-
 #~ msgid "Kind of field"
 #~ msgstr "å??ç±»å??"
 
@@ -1389,9 +1653,6 @@ msgstr "è¡¨"
 #~ msgid "Select (exception)"
 #~ msgstr "é??æ?© (exception)"
 
-#~ msgid "SQL text"
-#~ msgstr "SQL æ??æ?¬"
-
 #~ msgid "entity.*"
 #~ msgstr "entity.*"
 
@@ -1521,9 +1782,6 @@ msgstr "è¡¨"
 #~ msgid "DEFAULT ok"
 #~ msgstr "é»?è®¤å?¯ä»¥"
 
-#~ msgid "Actions?"
-#~ msgstr "å?¨ä½?ï¼?"
-
 #~ msgid "Set as original"
 #~ msgstr "è®¾ç½®ä¸ºå??å§?å?¼"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]