[jboss-cvs] JBossAS SVN: r95939 - projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Nov 2 22:00:55 EST 2009


Author: xhuang at jboss.com
Date: 2009-11-02 22:00:55 -0500 (Mon, 02 Nov 2009)
New Revision: 95939

Modified:
   projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/association_mapping.po
   projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/basic_mapping.po
Log:
update

Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/association_mapping.po
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/association_mapping.po	2009-11-03 00:17:05 UTC (rev 95938)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/association_mapping.po	2009-11-03 03:00:55 UTC (rev 95939)
@@ -1,12 +1,13 @@
+# translation of association_mapping.po to
+# Xi Huang <xhuang at redhat.com>, 2006.
+# Xi HUANG <xhuang at redhat.com>, 2007, 2009.
 # translation of Collection_Mapping.po to
-# Xi Huang <xhuang at redhat.com>, 2006.
-# Xi HUANG <xhuang at redhat.com>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: Collection_Mapping\n"
+"Project-Id-Version: association_mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2009-09-15 07:03+0000\n"
-"PO-Revision-Date: 2007-02-26 10:59+1000\n"
+"PO-Revision-Date: 2009-11-03 11:04+1000\n"
 "Last-Translator: Xi HUANG <xhuang at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +29,7 @@
 
 #. Tag: para
 #: association_mapping.xml:35
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Association mappings are often the most difficult thing to implement "
 "correctly. In this section we examine some canonical cases one by one, "
@@ -37,20 +38,19 @@
 "examples."
 msgstr ""
 "关联关系映射通常情况是最难配置正确的。在这个部分中,我们从单向关系映射开始,"
-"然后考虑双向关系映射,由浅至深讲述一遍典型的案例。在所有的例子中,我们都使"
-"用  <literal>Person</literal> 和 <literal>Address</literal>。"
+"然后考虑双向关系映射,逐步讲解典型的案例。在所有的例子中,我们都使将用 <literal>Person</literal> 和 <literal>Address</literal>。"
 
 #. Tag: para
 #: association_mapping.xml:43
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Associations will be classified by multiplicity and whether or not they map "
 "to an intervening join table."
-msgstr "我们根据映射关系是否涉及连接表以及多样性来划分关联类型。"
+msgstr "我们根据映射关系是否涉及连接表以及多样性(multiplicity)来划分关联类型。 "
 
 #. Tag: para
 #: association_mapping.xml:48
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Nullable foreign keys are not considered to be good practice in traditional "
 "data modelling, so our examples do not use nullable foreign keys. This is "
@@ -59,7 +59,7 @@
 msgstr ""
 "在传统的数据建模中,允许为 Null 值的外键被认为是一种不好的实践,因此我们所有"
 "的例子中都使用不允许为 Null 的外键。这并不是 Hibernate的 要求,即使你删除掉不"
-"允许为 Null 的约束,Hibernate 映射一样可以工作的很好。"
+"允许为 Null 的约束,Hibernate 映射一样可以工作的很好。 "
 
 #. Tag: title
 #: association_mapping.xml:58
@@ -69,9 +69,9 @@
 
 #. Tag: title
 #: association_mapping.xml:61 association_mapping.xml:132
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Many-to-one"
-msgstr "多对一(many-to-one)"
+msgstr "多对一(many-to-one) "
 
 #. Tag: para
 #: association_mapping.xml:63
@@ -83,7 +83,7 @@
 
 #. Tag: programlisting
 #: association_mapping.xml:68
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -100,24 +100,24 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;many-to-one name=\"address\" \n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <many-to-one name=\"address\" \n"
 "        column=\"addressId\"\n"
-"        not-null=\"true\"/&gt;\n"
-"&lt;/class&gt;\n"
+"        not-null=\"true\"/>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:69 association_mapping.xml:185
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key, addressId bigint "
@@ -125,16 +125,18 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key, addressId bigint "
 "not null )\n"
-"create table Address ( addressId bigint not null primary key )"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: title
 #: association_mapping.xml:74 association_mapping.xml:145
 #: association_mapping.xml:210
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "One-to-one"
-msgstr "一对一"
+msgstr "一对一(One-to-one)"
 
 #. Tag: para
 #: association_mapping.xml:76
@@ -150,7 +152,7 @@
 
 #. Tag: programlisting
 #: association_mapping.xml:81
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -168,25 +170,25 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;many-to-one name=\"address\" \n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <many-to-one name=\"address\" \n"
 "        column=\"addressId\" \n"
 "        unique=\"true\"\n"
-"        not-null=\"true\"/&gt;\n"
-"&lt;/class&gt;\n"
+"        not-null=\"true\"/>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:82 association_mapping.xml:218
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key, addressId bigint "
@@ -194,24 +196,26 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key, addressId bigint "
 "not null unique )\n"
-"create table Address ( addressId bigint not null primary key )"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: para
 #: association_mapping.xml:84
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a primary key</"
 "emphasis> usually uses a special id generator In this example, however, we "
 "have reversed the direction of the association:"
 msgstr ""
 "<emphasis>基于主键关联的单向一对一关联</emphasis>通常使用一个特定的 id 生成"
-"器。(请注意,在这个例子中我们掉换了关联的方向。)"
+"器,然而在这个例子中我们掉换了关联的方向:"
 
 #. Tag: programlisting
 #: association_mapping.xml:90
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -228,52 +232,52 @@
 "    <one-to-one name=\"person\" constrained=\"true\"/>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"foreign\"&gt;\n"
-"            &lt;param name=\"property\"&gt;person&lt;/param&gt;\n"
-"        &lt;/generator&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;one-to-one name=\"person\" constrained=\"true\"/&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"foreign\">\n"
+"            <param name=\"property\">person</param>\n"
+"        </generator>\n"
+"    </id>\n"
+"    <one-to-one name=\"person\" constrained=\"true\"/>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:91 association_mapping.xml:226
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
 "create table Address ( personId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
-"create table Address ( personId bigint not null primary key )"
+"create table Address ( personId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: title
 #: association_mapping.xml:96 association_mapping.xml:118
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "One-to-many"
-msgstr "一对多(one-to-many)"
+msgstr "一对多(one-to-many) "
 
 #. Tag: para
 #: association_mapping.xml:98
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a foreign key</"
 "emphasis> is an unusual case, and is not recommended."
-msgstr ""
-"<emphasis>基于外键关联的单向一对多关联</emphasis>是一种很少见的情况,并不推荐"
-"使用。"
+msgstr "<emphasis>基于外键关联的单向一对多关联</emphasis>是一种很少见的情况,我们不推荐使用它。"
 
 #. Tag: programlisting
 #: association_mapping.xml:103
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -292,26 +296,26 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"addresses\"&gt;\n"
-"        &lt;key column=\"personId\" \n"
-"            not-null=\"true\"/&gt;\n"
-"        &lt;one-to-many class=\"Address\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"addresses\">\n"
+"        <key column=\"personId\" \n"
+"            not-null=\"true\"/>\n"
+"        <one-to-many class=\"Address\"/>\n"
+"    </set>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:104
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -319,15 +323,17 @@
 "bigint not null )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
 "create table Address ( addressId bigint not null primary key, personId "
-"bigint not null )"
+"bigint not null )\n"
+"        ]]>"
 
 #. Tag: para
 #: association_mapping.xml:106
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "You should instead use a join table for this kind of association."
-msgstr "我们认为对于这种关联关系最好使用连接表。"
+msgstr "我们认为对于这种关联关系最好使用连接表。 "
 
 #. Tag: title
 #: association_mapping.xml:115
@@ -337,19 +343,18 @@
 
 #. Tag: para
 #: association_mapping.xml:120
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-many association on a join table</"
 "emphasis> is the preferred option. Specifying <literal>unique=\"true\"</"
 "literal>, changes the multiplicity from many-to-many to one-to-many."
 msgstr ""
 "<emphasis>基于连接表的单向一对多关联</emphasis> 应该优先被采用。请注意,通过"
-"指定<literal>unique=\"true\"</literal>,我们可以把多样性从多对多改变为一对"
-"多。"
+"指定<literal>unique=\"true\"</literal>,我们可以把多样性从多对多改变为一对多。"
 
 #. Tag: programlisting
 #: association_mapping.xml:126
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -369,27 +374,27 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"addresses\" table=\"PersonAddress\"&gt;\n"
-"        &lt;key column=\"personId\"/&gt;\n"
-"        &lt;many-to-many column=\"addressId\"\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"addresses\" table=\"PersonAddress\">\n"
+"        <key column=\"personId\"/>\n"
+"        <many-to-many column=\"addressId\"\n"
 "            unique=\"true\"\n"
-"            class=\"Address\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;\n"
+"            class=\"Address\"/>\n"
+"    </set>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:127
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -398,24 +403,24 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
-"create table PersonAddress ( personId not null, addressId bigint \n"
-"    not null primary key )\n"
-"create table Address ( addressId bigint not null primary key )"
+"create table PersonAddress ( personId not null, addressId bigint not null "
+"primary key )\n"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: para
 #: association_mapping.xml:134
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional many-to-one association on a join table</"
 "emphasis> is common when the association is optional. For example:"
-msgstr ""
-"<emphasis>基于连接表的单向多对一关联</emphasis>在关联关系可选的情况下应用也很"
-"普遍。"
+msgstr "<emphasis>基于连接表的单向多对一关联</emphasis>在关联关系可选的情况下应用也很普遍。例如:"
 
 #. Tag: programlisting
 #: association_mapping.xml:139
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -436,28 +441,28 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;join table=\"PersonAddress\" \n"
-"        optional=\"true\"&gt;\n"
-"        &lt;key column=\"personId\" unique=\"true\"/&gt;\n"
-"        &lt;many-to-one name=\"address\"\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <join table=\"PersonAddress\" \n"
+"        optional=\"true\">\n"
+"        <key column=\"personId\" unique=\"true\"/>\n"
+"        <many-to-one name=\"address\"\n"
 "            column=\"addressId\" \n"
-"            not-null=\"true\"/&gt;\n"
-"    &lt;/join&gt;\n"
-"&lt;/class&gt;\n"
+"            not-null=\"true\"/>\n"
+"    </join>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:140
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -466,23 +471,24 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
 "create table PersonAddress ( personId bigint not null primary key, addressId "
 "bigint not null )\n"
-"create table Address ( addressId bigint not null primary key )"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: para
 #: association_mapping.xml:147
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>unidirectional one-to-one association on a join table</emphasis> "
 "is possible, but extremely unusual."
-msgstr ""
-"<emphasis>基于连接表的单向一对一关联</emphasis>非常少见,但也是可行的。"
+msgstr "<emphasis>基于连接表的单向一对一关联</emphasis>也是可行的,但非常少见。"
 
 #. Tag: programlisting
 #: association_mapping.xml:152
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -505,30 +511,30 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;join table=\"PersonAddress\" \n"
-"        optional=\"true\"&gt;\n"
-"        &lt;key column=\"personId\" \n"
-"            unique=\"true\"/&gt;\n"
-"        &lt;many-to-one name=\"address\"\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <join table=\"PersonAddress\" \n"
+"        optional=\"true\">\n"
+"        <key column=\"personId\" \n"
+"            unique=\"true\"/>\n"
+"        <many-to-one name=\"address\"\n"
 "            column=\"addressId\" \n"
 "            not-null=\"true\"\n"
-"            unique=\"true\"/&gt;\n"
-"    &lt;/join&gt;\n"
-"&lt;/class&gt;\n"
+"            unique=\"true\"/>\n"
+"    </join>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:153 association_mapping.xml:258
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -537,29 +543,30 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
 "create table PersonAddress ( personId bigint not null primary key, addressId "
-"bigint\n"
-"    not null unique )\n"
-"create table Address ( addressId bigint not null primary key )"
+"bigint not null unique )\n"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: title
 #: association_mapping.xml:158 association_mapping.xml:263
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Many-to-many"
-msgstr "多对多(many-to-many)"
+msgstr "多对多(many-to-many) "
 
 #. Tag: para
 #: association_mapping.xml:160
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Finally, here is an example of a <emphasis>unidirectional many-to-many "
 "association</emphasis>."
-msgstr "最后,还有 <emphasis>单向多对多关联</emphasis>."
+msgstr "最后,这里是一个<emphasis>单向多对多关联</emphasis>的例子。"
 
 #. Tag: programlisting
 #: association_mapping.xml:164
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -578,26 +585,26 @@
 "    </id>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"addresses\" table=\"PersonAddress\"&gt;\n"
-"        &lt;key column=\"personId\"/&gt;\n"
-"        &lt;many-to-many column=\"addressId\"\n"
-"            class=\"Address\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"addresses\" table=\"PersonAddress\">\n"
+"        <key column=\"personId\"/>\n"
+"        <many-to-many column=\"addressId\"\n"
+"            class=\"Address\"/>\n"
+"    </set>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:165 association_mapping.xml:271
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -606,11 +613,12 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
 "create table PersonAddress ( personId bigint not null, addressId bigint not "
-"null, \n"
-"    primary key (personId, addressId) )\n"
-"create table Address ( addressId bigint not null primary key )"
+"null, primary key (personId, addressId) )\n"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: title
 #: association_mapping.xml:172
@@ -620,24 +628,24 @@
 
 #. Tag: title
 #: association_mapping.xml:175 association_mapping.xml:236
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "one-to-many / many-to-one"
-msgstr "一对多(one to many)/多对一(many to one)"
+msgstr "一对多(one to many)/多对一(many to one) "
 
 #. Tag: para
 #: association_mapping.xml:177
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>bidirectional many-to-one association</emphasis> is the most "
 "common kind of association. The following example illustrates the standard "
 "parent/child relationship."
 msgstr ""
-"<emphasis>双向多对一关联</emphasis> 是最常见的关联关系。(这也是标准的父/子关"
-"联关系。)"
+"<emphasis>双向多对一关联</emphasis> 是最常见的关联关系。下面的例子解释了这种标准的父/子关"
+"联关系。"
 
 #. Tag: programlisting
 #: association_mapping.xml:183
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -658,28 +666,28 @@
 "    </set>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;many-to-one name=\"address\" \n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <many-to-one name=\"address\" \n"
 "        column=\"addressId\"\n"
-"        not-null=\"true\"/&gt;\n"
-"&lt;/class&gt;\n"
+"        not-null=\"true\"/>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"people\" inverse=\"true\"&gt;\n"
-"        &lt;key column=\"addressId\"/&gt;\n"
-"        &lt;one-to-many class=\"Person\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"people\" inverse=\"true\">\n"
+"        <key column=\"addressId\"/>\n"
+"        <one-to-many class=\"Person\"/>\n"
+"    </set>\n"
+"</class>]]>"
 
 #. Tag: para
 #: association_mapping.xml:187
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you use a <literal>List</literal>, or other indexed collection, set the "
 "<literal>key</literal> column of the foreign key to <literal>not null</"
@@ -689,13 +697,13 @@
 "\"</literal>:"
 msgstr ""
 "如果你使用 <literal>List</literal>(或者其他有序集合类),你需要设置外键对应"
-"的 <literal>key</literal> 列为 <literal>not null</literal>,让 Hibernate 来从"
-"集合端管理关联,维护每个元素的索引(通过设置 <literal>update=\"false\"</"
-"literal> 和 <literal>insert=\"false\"</literal> 来对另一端反向操作)。"
+"的 <literal>key</literal> 列为 <literal>not null</literal>。Hibernate 将从"
+"集合端管理关联,维护每个元素的索引,并通过设置 <literal>update=\"false\"</"
+"literal> 和 <literal>insert=\"false\"</literal> 来对另一端反向操作。"
 
 #. Tag: programlisting
 #: association_mapping.xml:195
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "   <id name=\"id\"/>\n"
@@ -717,29 +725,29 @@
 "   </list>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"   &lt;id name=\"id\"/&gt;\n"
+"<![CDATA[<class name=\"Person\">\n"
+"   <id name=\"id\"/>\n"
 "   ...\n"
-"   &lt;many-to-one name=\"address\"\n"
+"   <many-to-one name=\"address\"\n"
 "      column=\"addressId\"\n"
 "      not-null=\"true\"\n"
 "      insert=\"false\"\n"
-"      update=\"false\"/&gt;\n"
-"&lt;/class&gt;\n"
+"      update=\"false\"/>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"   &lt;id name=\"id\"/&gt;\n"
+"<class name=\"Address\">\n"
+"   <id name=\"id\"/>\n"
 "   ...\n"
-"   &lt;list name=\"people\"&gt;\n"
-"      &lt;key column=\"addressId\" not-null=\"true\"/&gt;\n"
-"      &lt;list-index column=\"peopleIdx\"/&gt;\n"
-"      &lt;one-to-many class=\"Person\"/&gt;\n"
-"   &lt;/list&gt;\n"
-"&lt;/class&gt;"
+"   <list name=\"people\">\n"
+"      <key column=\"addressId\" not-null=\"true\"/>\n"
+"      <list-index column=\"peopleIdx\"/>\n"
+"      <one-to-many class=\"Person\"/>\n"
+"   </list>\n"
+"</class>]]>"
 
 #. Tag: para
 #: association_mapping.xml:197
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If the underlying foreign key column is <literal>NOT NULL</literal>, it is "
 "important that you define <literal>not-null=\"true\"</literal> on the "
@@ -752,19 +760,19 @@
 "<literal>NOT NULL</literal> 的,那么为这一 key 元素定义 <literal>not-null="
 "\"true\"</literal> 是很重要的。不要仅仅为可能的嵌套 <literal>&lt;column&gt;</"
 "literal>元素定义 <literal>not-null=\"true\"</literal>,<literal>&lt;key&gt;</"
-"literal> 元素也是需要的。"
+"literal> 元素也是需要的。 "
 
 #. Tag: para
 #: association_mapping.xml:212
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a foreign key</emphasis> "
 "is common:"
-msgstr "<emphasis>基于外键关联的双向一对一关联</emphasis>也很常见。"
+msgstr "<emphasis>基于外键关联的双向一对一关联</emphasis>也很常见。 "
 
 #. Tag: programlisting
 #: association_mapping.xml:217
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -784,36 +792,35 @@
 "        property-ref=\"address\"/>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;many-to-one name=\"address\" \n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <many-to-one name=\"address\" \n"
 "        column=\"addressId\" \n"
 "        unique=\"true\"\n"
-"        not-null=\"true\"/&gt;\n"
-"&lt;/class&gt;\n"
+"        not-null=\"true\"/>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"   &lt;one-to-one name=\"person\" \n"
-"        property-ref=\"address\"/&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"   <one-to-one name=\"person\" \n"
+"        property-ref=\"address\"/>\n"
+"</class>]]>"
 
 #. Tag: para
 #: association_mapping.xml:220
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a primary key</emphasis> "
 "uses the special id generator:"
-msgstr ""
-"<emphasis>基于主键关联的一对一关联</emphasis>需要使用特定的 id 生成器。"
+msgstr "<emphasis>基于主键关联的一对一关联</emphasis>需要使用特定的 id 生成器:"
 
 #. Tag: programlisting
 #: association_mapping.xml:225
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -832,22 +839,22 @@
 "        constrained=\"true\"/>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;one-to-one name=\"address\"/&gt;\n"
-"&lt;/class&gt;\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <one-to-one name=\"address\"/>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"foreign\"&gt;\n"
-"            &lt;param name=\"property\"&gt;person&lt;/param&gt;\n"
-"        &lt;/generator&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;one-to-one name=\"person\" \n"
-"        constrained=\"true\"/&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"foreign\">\n"
+"            <param name=\"property\">person</param>\n"
+"        </generator>\n"
+"    </id>\n"
+"    <one-to-one name=\"person\" \n"
+"        constrained=\"true\"/>\n"
+"</class>]]>"
 
 #. Tag: title
 #: association_mapping.xml:233
@@ -857,19 +864,19 @@
 
 #. Tag: para
 #: association_mapping.xml:238
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The following is an example of a <emphasis>bidirectional one-to-many "
 "association on a join table</emphasis>. The <literal>inverse=\"true\"</"
 "literal> can go on either end of the association, on the collection, or on "
 "the join."
 msgstr ""
-"<emphasis>基于连接表的双向一对多关联</emphasis>。注意 <literal>inverse=\"true"
+"下面是一个<emphasis>基于连接表的双向一对多关联</emphasis>的例子。注意 <literal>inverse=\"true"
 "\"</literal> 可以出现在关联的任意一端,即 collection 端或者 join 端。"
 
 #. Tag: programlisting
 #: association_mapping.xml:244
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -898,36 +905,36 @@
 "    </join>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"addresses\" \n"
-"        table=\"PersonAddress\"&gt;\n"
-"        &lt;key column=\"personId\"/&gt;\n"
-"        &lt;many-to-many column=\"addressId\"\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"addresses\" \n"
+"        table=\"PersonAddress\">\n"
+"        <key column=\"personId\"/>\n"
+"        <many-to-many column=\"addressId\"\n"
 "            unique=\"true\"\n"
-"            class=\"Address\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;\n"
+"            class=\"Address\"/>\n"
+"    </set>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;join table=\"PersonAddress\" \n"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <join table=\"PersonAddress\" \n"
 "        inverse=\"true\" \n"
-"        optional=\"true\"&gt;\n"
-"        &lt;key column=\"addressId\"/&gt;\n"
-"        &lt;many-to-one name=\"person\"\n"
+"        optional=\"true\">\n"
+"        <key column=\"addressId\"/>\n"
+"        <many-to-one name=\"person\"\n"
 "            column=\"personId\"\n"
-"            not-null=\"true\"/&gt;\n"
-"    &lt;/join&gt;\n"
-"&lt;/class&gt;"
+"            not-null=\"true\"/>\n"
+"    </join>\n"
+"</class>]]>"
 
 #. Tag: programlisting
 #: association_mapping.xml:245
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
@@ -936,10 +943,12 @@
 "create table Address ( addressId bigint not null primary key )\n"
 "        ]]>"
 msgstr ""
+"<![CDATA[\n"
 "create table Person ( personId bigint not null primary key )\n"
 "create table PersonAddress ( personId bigint not null, addressId bigint not "
 "null primary key )\n"
-"create table Address ( addressId bigint not null primary key )"
+"create table Address ( addressId bigint not null primary key )\n"
+"        ]]>"
 
 #. Tag: title
 #: association_mapping.xml:250
@@ -949,16 +958,15 @@
 
 #. Tag: para
 #: association_mapping.xml:252
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "A <emphasis>bidirectional one-to-one association on a join table</emphasis> "
 "is possible, but extremely unusual."
-msgstr ""
-"<emphasis>基于连接表的双向一对一关联</emphasis>极为罕见,但也是可行的。"
+msgstr "<emphasis>基于连接表的双向一对一关联</emphasis>也是可行的,但极为罕见。"
 
 #. Tag: programlisting
 #: association_mapping.xml:257
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -991,48 +999,48 @@
 "    </join>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;join table=\"PersonAddress\" \n"
-"        optional=\"true\"&gt;\n"
-"        &lt;key column=\"personId\" \n"
-"            unique=\"true\"/&gt;\n"
-"        &lt;many-to-one name=\"address\"\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <join table=\"PersonAddress\" \n"
+"        optional=\"true\">\n"
+"        <key column=\"personId\" \n"
+"            unique=\"true\"/>\n"
+"        <many-to-one name=\"address\"\n"
 "            column=\"addressId\" \n"
 "            not-null=\"true\"\n"
-"            unique=\"true\"/&gt;\n"
-"    &lt;/join&gt;\n"
-"&lt;/class&gt;\n"
+"            unique=\"true\"/>\n"
+"    </join>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;join table=\"PersonAddress\" \n"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <join table=\"PersonAddress\" \n"
 "        optional=\"true\"\n"
-"        inverse=\"true\"&gt;\n"
-"        &lt;key column=\"addressId\" \n"
-"            unique=\"true\"/&gt;\n"
-"        &lt;many-to-one name=\"person\"\n"
+"        inverse=\"true\">\n"
+"        <key column=\"addressId\" \n"
+"            unique=\"true\"/>\n"
+"        <many-to-one name=\"person\"\n"
 "            column=\"personId\" \n"
 "            not-null=\"true\"\n"
-"            unique=\"true\"/&gt;\n"
-"    &lt;/join&gt;\n"
-"&lt;/class&gt;"
+"            unique=\"true\"/>\n"
+"    </join>\n"
+"</class>]]>"
 
 #. Tag: para
 #: association_mapping.xml:265
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Here is an example of a <emphasis>bidirectional many-to-many association</"
 "emphasis>."
-msgstr "最后,还有 <emphasis>双向多对多关联</emphasis>."
+msgstr "下面是一个<emphasis>双向多对多关联</emphasis>的例子。"
 
 #. Tag: programlisting
 #: association_mapping.xml:269
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class name=\"Person\">\n"
 "    <id name=\"id\" column=\"personId\">\n"
@@ -1056,27 +1064,27 @@
 "    </set>\n"
 "</class>]]>"
 msgstr ""
-"&lt;class name=\"Person\"&gt;\n"
-"    &lt;id name=\"id\" column=\"personId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"addresses\" table=\"PersonAddress\"&gt;\n"
-"        &lt;key column=\"personId\"/&gt;\n"
-"        &lt;many-to-many column=\"addressId\"\n"
-"            class=\"Address\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;\n"
+"<![CDATA[<class name=\"Person\">\n"
+"    <id name=\"id\" column=\"personId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"addresses\" table=\"PersonAddress\">\n"
+"        <key column=\"personId\"/>\n"
+"        <many-to-many column=\"addressId\"\n"
+"            class=\"Address\"/>\n"
+"    </set>\n"
+"</class>\n"
 "\n"
-"&lt;class name=\"Address\"&gt;\n"
-"    &lt;id name=\"id\" column=\"addressId\"&gt;\n"
-"        &lt;generator class=\"native\"/&gt;\n"
-"    &lt;/id&gt;\n"
-"    &lt;set name=\"people\" inverse=\"true\" table=\"PersonAddress\"&gt;\n"
-"        &lt;key column=\"addressId\"/&gt;\n"
-"        &lt;many-to-many column=\"personId\"\n"
-"            class=\"Person\"/&gt;\n"
-"    &lt;/set&gt;\n"
-"&lt;/class&gt;"
+"<class name=\"Address\">\n"
+"    <id name=\"id\" column=\"addressId\">\n"
+"        <generator class=\"native\"/>\n"
+"    </id>\n"
+"    <set name=\"people\" inverse=\"true\" table=\"PersonAddress\">\n"
+"        <key column=\"addressId\"/>\n"
+"        <many-to-many column=\"personId\"\n"
+"            class=\"Person\"/>\n"
+"    </set>\n"
+"</class>]]>"
 
 #. Tag: title
 #: association_mapping.xml:278
@@ -1086,7 +1094,7 @@
 
 #. Tag: para
 #: association_mapping.xml:280
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "More complex association joins are <emphasis>extremely</emphasis> rare. "
 "Hibernate handles more complex situations by using SQL fragments embedded in "
@@ -1095,14 +1103,14 @@
 "<literal>effectiveEndDate</literal> and <literal>effectiveStartDate</"
 "literal>columns, it would be mapped as follows:"
 msgstr ""
-"更复杂的关联连接<emphasis>极为</emphasis>罕见。 通过在映射文档中嵌入 SQL 片"
+"更复杂的关联连接<emphasis>极为</emphasis>罕见。通过在映射文档中嵌入 SQL 片"
 "断,Hibernate 也可以处理更为复杂的情况。比如,假若包含历史帐户数据的表定义了 "
 "<literal>accountNumber</literal>、<literal>effectiveEndDate</literal> 和 "
 "<literal>effectiveStartDate</literal> 字段,按照下面映射:"
 
 #. Tag: programlisting
 #: association_mapping.xml:289
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<properties name=\"currentAccountKey\">\n"
 "    <property name=\"accountNumber\" type=\"string\" not-null=\"true\"/>\n"
@@ -1114,30 +1122,29 @@
 "<property name=\"effectiveEndDate\" type=\"date\"/>\n"
 "<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 msgstr ""
-"&lt;properties name=\"currentAccountKey\"&gt;\n"
-"    &lt;property name=\"accountNumber\" type=\"string\" not-null=\"true\"/"
-"&gt;\n"
-"    &lt;property name=\"currentAccount\" type=\"boolean\"&gt;\n"
-"        &lt;formula&gt;case when effectiveEndDate is null then 1 else 0 "
-"end&lt;/formula&gt;\n"
-"    &lt;/property&gt;\n"
-"&lt;/properties&gt;\n"
-"&lt;property name=\"effectiveEndDate\" type=\"date\"/&gt;\n"
-"&lt;property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/&gt;"
+"<![CDATA[<properties name=\"currentAccountKey\">\n"
+"    <property name=\"accountNumber\" type=\"string\" not-null=\"true\"/>\n"
+"    <property name=\"currentAccount\" type=\"boolean\">\n"
+"        <formula>case when effectiveEndDate is null then 1 else 0 end</"
+"formula>\n"
+"    </property>\n"
+"</properties>\n"
+"<property name=\"effectiveEndDate\" type=\"date\"/>\n"
+"<property name=\"effectiveStateDate\" type=\"date\" not-null=\"true\"/>]]>"
 
 #. Tag: para
 #: association_mapping.xml:291
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You can then map an association to the <emphasis>current</emphasis> "
 "instance, the one with null <literal>effectiveEndDate</literal>, by using:"
 msgstr ""
 "那么我们可以对<emphasis>目前(current)</emphasis>实例(其 "
-"<literal>effectiveEndDate</literal> 为 null)使用这样的关联映射:"
+"<literal>effectiveEndDate</literal> 为 null)使用这样的关联映射: "
 
 #. Tag: programlisting
 #: association_mapping.xml:296
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
 "        property-ref=\"currentAccountKey\"\n"
@@ -1146,16 +1153,16 @@
 "    <formula>'1'</formula>\n"
 "</many-to-one>]]>"
 msgstr ""
-"&lt;many-to-one name=\"currentAccountInfo\" \n"
+"<![CDATA[<many-to-one name=\"currentAccountInfo\" \n"
 "        property-ref=\"currentAccountKey\"\n"
-"        class=\"AccountInfo\"&gt;\n"
-"    &lt;column name=\"accountNumber\"/&gt;\n"
-"    &lt;formula&gt;'1'&lt;/formula&gt;\n"
-"&lt;/many-to-one&gt;"
+"        class=\"AccountInfo\">\n"
+"    <column name=\"accountNumber\"/>\n"
+"    <formula>'1'</formula>\n"
+"</many-to-one>]]>"
 
 #. Tag: para
 #: association_mapping.xml:298
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "In a more complex example, imagine that the association between "
 "<literal>Employee</literal> and <literal>Organization</literal> is "
@@ -1164,14 +1171,14 @@
 "emphasis> employer, the one with the most recent <literal>startDate</"
 "literal>, could be mapped in the following way:"
 msgstr ""
-"更复杂的例子,假想 <literal>Employee</literal> 和 <literal>Organization</"
-"literal> 之间的关联是通过一个 <literal>Employment</literal> 中间表维护的,而中"
+"在更复杂的例子中,假想 <literal>Employee</literal> 和 <literal>Organization</"
+"literal> 之间的关联是通过一个 <literal>Employment</literal> 中间表维护的,而中"
 "间表中填充了很多历史雇员数据。那“雇员的<emphasis>最新</emphasis>雇主”这个关联"
-"(最新雇主就是 <literal>startDate</literal> 最后的那个)可以这样映射:"
+"(最新雇主就是具有最新的 <literal>startDate</literal> 的那个)可以这样映射:"
 
 #. Tag: programlisting
 #: association_mapping.xml:306
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<join>\n"
 "    <key column=\"employeeId\"/>\n"
@@ -1186,25 +1193,24 @@
 "            column=\"orgId\"/>\n"
 "</join>]]>"
 msgstr ""
-"&lt;join&gt;\n"
-"    &lt;key column=\"employeeId\"/&gt;\n"
-"    &lt;subselect&gt;\n"
+"<![CDATA[<join>\n"
+"    <key column=\"employeeId\"/>\n"
+"    <subselect>\n"
 "        select employeeId, orgId \n"
 "        from Employments \n"
 "        group by orgId \n"
 "        having startDate = max(startDate)\n"
-"    &lt;/subselect&gt;\n"
-"    &lt;many-to-one name=\"mostRecentEmployer\" \n"
+"    </subselect>\n"
+"    <many-to-one name=\"mostRecentEmployer\" \n"
 "            class=\"Organization\" \n"
-"            column=\"orgId\"/&gt;\n"
-"&lt;/join&gt;"
+"            column=\"orgId\"/>\n"
+"</join>]]>"
 
 #. Tag: para
 #: association_mapping.xml:308
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "This functionality allows a degree of creativity and flexibility, but it is "
 "more practical to handle these kinds of cases using HQL or a criteria query."
-msgstr ""
-"使用这一功能时可以充满创意,但通常更加实用的是用 HQL 或条件查询来处理这些情"
-"形。"
+msgstr "使用这一功能时可以充满创意和灵活性,但通常更加实用的是用 HQL 或条件查询来处理这些情况。"
+

Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/basic_mapping.po
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/basic_mapping.po	2009-11-03 00:17:05 UTC (rev 95938)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/zh-CN/basic_mapping.po	2009-11-03 03:00:55 UTC (rev 95939)
@@ -1,12 +1,13 @@
-# translation of Collection_Mapping.po to
+# translation of basic_mapping.po to
 # Xi Huang <xhuang at redhat.com>, 2006.
-# Xi HUANG <xhuang at redhat.com>, 2007.
+# Xi HUANG <xhuang at redhat.com>, 2007, 2009.
+# translation of Collection_Mapping.po to
 msgid ""
 msgstr ""
-"Project-Id-Version: Collection_Mapping\n"
+"Project-Id-Version: basic_mapping\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2009-09-15 07:03+0000\n"
-"PO-Revision-Date: 2007-02-26 10:59+1000\n"
+"PO-Revision-Date: 2009-11-03 13:00+1000\n"
 "Last-Translator: Xi HUANG <xhuang at redhat.com>\n"
 "Language-Team:  <en at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -28,37 +29,37 @@
 
 #. Tag: para
 #: basic_mapping.xml:34
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Object/relational mappings are usually defined in an XML document. The "
 "mapping document is designed to be readable and hand-editable. The mapping "
 "language is Java-centric, meaning that mappings are constructed around "
 "persistent class declarations and not table declarations."
 msgstr ""
-"对象和关系数据库之间的映射通常是用一个 XML 文档(XML document)来定义的。这个"
+"对象和关系数据库之间的映射通常是用一个 XML 文档来定义的。这个"
 "映射文档被设计为易读的,并且可以手工修改。映射语言是以 Java 为中心,这意味着"
 "映射文档是按照持久化类的定义来创建的,而非表的定义。 "
 
 #. Tag: para
 #: basic_mapping.xml:41
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Please note that even though many Hibernate users choose to write the XML by "
 "hand, a number of tools exist to generate the mapping document. These "
 "include XDoclet, Middlegen and AndroMDA."
 msgstr ""
 "请注意,虽然很多 Hibernate 用户选择手写 XML 映射文档,但也有一些工具可以用来"
-"生成映射文档,包括 XDoclet,Middlegen 和 AndroMDA。"
+"生成映射文档,包括 XDoclet、Middlegen 和 AndroMDA。"
 
 #. Tag: para
 #: basic_mapping.xml:47
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Here is an example mapping:"
-msgstr "让我们从一个映射的例子开始:"
+msgstr "下面是一个映射的例子:"
 
 #. Tag: programlisting
 #: basic_mapping.xml:51
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -125,75 +126,74 @@
 "\n"
 "</hibernate-mapping>]]>"
 msgstr ""
-"&lt;?xml version=\"1.0\"?&gt;\n"
-"&lt;!DOCTYPE hibernate-mapping PUBLIC\n"
+"<![CDATA[<?xml version=\"1.0\"?>\n"
+"<!DOCTYPE hibernate-mapping PUBLIC\n"
 "      \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
-"          \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"
-"\"&gt;\n"
+"          \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\">\n"
 "\n"
-"&lt;hibernate-mapping package=\"eg\"&gt;\n"
+"<hibernate-mapping package=\"eg\">\n"
 "\n"
-"        &lt;class name=\"Cat\" \n"
+"        <class name=\"Cat\"\n"
 "            table=\"cats\"\n"
-"            discriminator-value=\"C\"&gt;\n"
-"                \n"
-"                &lt;id name=\"id\"&gt;\n"
-"                        &lt;generator class=\"native\"/&gt;\n"
-"                &lt;/id&gt;\n"
+"            discriminator-value=\"C\">\n"
 "\n"
-"                &lt;discriminator column=\"subclass\" \n"
-"                     type=\"character\"/&gt;\n"
+"                <id name=\"id\">\n"
+"                        <generator class=\"native\"/>\n"
+"                </id>\n"
 "\n"
-"                &lt;property name=\"weight\"/&gt;\n"
+"                <discriminator column=\"subclass\"\n"
+"                     type=\"character\"/>\n"
 "\n"
-"                &lt;property name=\"birthdate\"\n"
-"                    type=\"date\" \n"
-"                    not-null=\"true\" \n"
-"                    update=\"false\"/&gt;\n"
+"                <property name=\"weight\"/>\n"
 "\n"
-"                &lt;property name=\"color\"\n"
+"                <property name=\"birthdate\"\n"
+"                    type=\"date\"\n"
+"                    not-null=\"true\"\n"
+"                    update=\"false\"/>\n"
+"\n"
+"                <property name=\"color\"\n"
 "                    type=\"eg.types.ColorUserType\"\n"
 "                    not-null=\"true\"\n"
-"                    update=\"false\"/&gt;\n"
+"                    update=\"false\"/>\n"
 "\n"
-"                &lt;property name=\"sex\"\n"
-"                    not-null=\"true\" \n"
-"                    update=\"false\"/&gt;\n"
+"                <property name=\"sex\"\n"
+"                    not-null=\"true\"\n"
+"                    update=\"false\"/>\n"
 "\n"
-"                &lt;property name=\"litterId\"\n"
+"                <property name=\"litterId\"\n"
 "                    column=\"litterId\"\n"
-"                    update=\"false\"/&gt;\n"
+"                    update=\"false\"/>\n"
 "\n"
-"                &lt;many-to-one name=\"mother\"\n"
+"                <many-to-one name=\"mother\"\n"
 "                    column=\"mother_id\"\n"
-"                    update=\"false\"/&gt;\n"
+"                    update=\"false\"/>\n"
 "\n"
-"                &lt;set name=\"kittens\"\n"
+"                <set name=\"kittens\"\n"
 "                    inverse=\"true\"\n"
-"                    order-by=\"litter_id\"&gt;\n"
-"                        &lt;key column=\"mother_id\"/&gt;\n"
-"                        &lt;one-to-many class=\"Cat\"/&gt;\n"
-"                &lt;/set&gt;\n"
+"                    order-by=\"litter_id\">\n"
+"                        <key column=\"mother_id\"/>\n"
+"                        <one-to-many class=\"Cat\"/>\n"
+"                </set>\n"
 "\n"
-"                &lt;subclass name=\"DomesticCat\"\n"
-"                    discriminator-value=\"D\"&gt;\n"
+"                <subclass name=\"DomesticCat\"\n"
+"                    discriminator-value=\"D\">\n"
 "\n"
-"                        &lt;property name=\"name\" \n"
-"                            type=\"string\"/&gt;\n"
+"                        <property name=\"name\"\n"
+"                            type=\"string\"/>\n"
 "\n"
-"                &lt;/subclass&gt;\n"
+"                </subclass>\n"
 "\n"
-"        &lt;/class&gt;\n"
+"        </class>\n"
 "\n"
-"        &lt;class name=\"Dog\"&gt;\n"
-"                &lt;!-- mapping for Dog could go here --&gt;\n"
-"        &lt;/class&gt;\n"
+"        <class name=\"Dog\">\n"
+"                <!-- mapping for Dog could go here -->\n"
+"        </class>\n"
 "\n"
-"&lt;/hibernate-mapping&gt;"
+"</hibernate-mapping>]]>"
 
 #. Tag: para
 #: basic_mapping.xml:53
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "We will now discuss the content of the mapping document. We will only "
 "describe, however, the document elements and attributes that are used by "
@@ -203,8 +203,8 @@
 msgstr ""
 "我们现在开始讨论映射文档的内容。我们只描述 Hibernate 在运行时用到的文档元素和"
 "属性。映射文档还包括一些额外的可选属性和元素,它们在使用 schema 导出工具的时"
-"候会影响导出的数据库 schema 结果。(比如,<literal>not-null</literal> 属"
-"性。)"
+"候会影响导出的数据库 schema 结果(比如,<literal>not-null</literal> 属"
+"性)。"
 
 #. Tag: title
 #: basic_mapping.xml:64
@@ -214,7 +214,7 @@
 
 #. Tag: para
 #: basic_mapping.xml:66
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "All XML mappings should declare the doctype shown. The actual DTD can be "
 "found at the URL above, in the directory <literal>hibernate-x.x.x/src/org/"
@@ -224,7 +224,8 @@
 "against the contents of your classpath."
 msgstr ""
 "所有的 XML 映射都需要定义如上所示的 doctype。DTD 可以从上述 URL 中获取,也可"
-"以从 <literal>hibernate-x.x.x/src/net/sf/hibernate</literal> 目录中、或 "
+"以从 <literal>hibernate-x.x.x/src/org/"
+"hibernate </literal> 目录中、或 "
 "<literal>hibernate.jar</literal> 文件中找到。Hibernate 总是会首先在它的 "
 "classptah 中搜索 DTD 文件。如果你发现它是通过连接 Internet 查找 DTD 文件,就"
 "对照你的 classpath 目录检查 XML 文件里的 DTD 声明。"
@@ -237,7 +238,7 @@
 
 #. Tag: para
 #: basic_mapping.xml:77
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Hibernate will first attempt to resolve DTDs in its classpath. It does this "
 "is by registering a custom <literal>org.xml.sax.EntityResolver</literal> "
@@ -245,14 +246,14 @@
 "custom <literal>EntityResolver</literal> recognizes two different systemId "
 "namespaces:"
 msgstr ""
-"如前所述,Hibernate 首先在其 classpath 中查找 DTD。其行为是依靠在系统中注册"
+"Hibernate 首先试图在其 classpath 中解析 DTD。这是依靠在系统中注册"
 "的 <literal>org.xml.sax.EntityResolver</literal> 的一个具体实现,SAXReader 依"
-"靠它来读取 xml 文件。这一 <literal>EntityResolver</literal> 实现能辨认两种不"
-"同的 systenId 命名空间。"
+"靠它来读取 xml 文件。这个自定义的 <literal>EntityResolver</literal> 能辨认两种不"
+"同的 systenId 命名空间:"
 
 #. Tag: para
 #: basic_mapping.xml:85
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "a <literal>hibernate namespace</literal> is recognized whenever the resolver "
 "encounters a systemId starting with <literal>http://hibernate.sourceforge."
@@ -261,11 +262,11 @@
 msgstr ""
 "若 resolver 遇到了一个以 <literal>http://hibernate.sourceforge.net/</"
 "literal> 为开头的 systemId,它会辨认出是 <literal>hibernate namespace</"
-"literal>,resolver 就试图通过加载 Hibernate 类的 classloader 来查找这些实体。"
+"literal>,resolver 就试图通过加载 Hibernate 类的 classloader 来查找这些实体。 "
 
 #. Tag: para
 #: basic_mapping.xml:94
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "a <literal>user namespace</literal> is recognized whenever the resolver "
 "encounters a systemId using a <literal>classpath://</literal> URL protocol. "
@@ -275,18 +276,17 @@
 msgstr ""
 "若 resolver 遇到了一个使用 <literal>classpath://</literal> URL 协议的 "
 "systemId,它会辨认出这是 <literal>user namespace</literal>,resolver 试图通过"
-"(1)当前线程上下文的 classloader 和(2)加载 Hibernate class 的 classloader 来"
-"查找这些实体。"
+"(1) 当前线程上下文的 classloader 和(2) 加载 Hibernate class 的 classloader 来查找这些实体。"
 
 #. Tag: para
 #: basic_mapping.xml:103
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "The following is an example of utilizing user namespacing:"
-msgstr "使用 user namespace(用户命名空间)的例子:"
+msgstr "下面是一个使用用户命名空间(user namespace)的例子:"
 
 #. Tag: programlisting
 #: basic_mapping.xml:106
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<?xml version=\"1.0\"?>\n"
 "<!DOCTYPE hibernate-mapping PUBLIC\n"
@@ -304,36 +304,43 @@
 "    &types;\n"
 "</hibernate-mapping>]]>"
 msgstr ""
-"&lt;?xml version=\"1.0\"?&gt;\n"
-"&lt;!DOCTYPE hibernate-mapping PUBLIC\n"
+"<![CDATA[<?xml version=\"1.0\"?>\n"
+"<!DOCTYPE hibernate-mapping PUBLIC\n"
 "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n"
-"        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\"&gt;\n"
+"        \"http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd\" [\n"
+"    <!ENTITY types SYSTEM \"classpath://your/domain/types.xml\">\n"
+"]>\n"
 "\n"
-"&lt;hibernate-mapping&gt;\n"
-"[...]\n"
-"&lt;/hibernate-mapping&gt;"
+"<hibernate-mapping package=\"your.domain\">\n"
+"    <class name=\"MyEntity\">\n"
+"        <id name=\"id\" type=\"my-custom-id-type\">\n"
+"            ...\n"
+"        </id>\n"
+"    <class>\n"
+"    &types;\n"
+"</hibernate-mapping>]]>"
 
 #. Tag: para
 #: basic_mapping.xml:107
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "Where <literal>types.xml</literal> is a resource in the <literal>your."
 "domain</literal> package and contains a custom <xref linkend=\"mapping-types-"
 "custom\"/>."
 msgstr ""
-"<literal>types.xml</literal> 是 <literal>your.domain</literal> 包中的一个资"
-"源,它包含了一个定制的 <xref linkend=\"Hibernate_Types-Custom_value_types\"/"
-">。"
+"这里的 <literal>types.xml</literal> 是 <literal>your.domain</literal> 包中的一个资"
+"源,它包含了一个自定义的 <xref linkend=\"mapping-types-"
+"custom\"/>。"
 
 #. Tag: title
 #: basic_mapping.xml:115
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Hibernate-mapping"
-msgstr "hibernate-mapping"
+msgstr "Hibernate-mapping"
 
 #. Tag: para
 #: basic_mapping.xml:117
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "This element has several optional attributes. The <literal>schema</literal> "
 "and <literal>catalog</literal> attributes specify that tables referred to in "
@@ -352,11 +359,11 @@
 "限定名。假若没有指定,表名就不会使用全限定名。<literal>default-cascade</"
 "literal> 指定了未明确注明 <literal>cascade</literal> 属性的 Java 属性和 集合"
 "类 Hibernate 会采取什么样的默认级联风格。<literal>auto-import</literal> 属性"
-"默认让我们在查询语言中可以使用 非全限定名的类名。"
+"默认让我们在查询语言中可以使用非全限定名的类名。"
 
 #. Tag: programlisting
 #: basic_mapping.xml:138
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<hibernate-mapping\n"
 "         schema=\"schemaName\"\n"
@@ -368,7 +375,7 @@
 "         package=\"package.name\"\n"
 " />]]>"
 msgstr ""
-"&lt;hibernate-mapping\n"
+"<![CDATA[<hibernate-mapping\n"
 "         schema=\"schemaName\"\n"
 "         catalog=\"catalogName\"\n"
 "         default-cascade=\"cascade_style\"\n"
@@ -376,33 +383,33 @@
 "         default-lazy=\"true|false\"\n"
 "         auto-import=\"true|false\"\n"
 "         package=\"package.name\"\n"
-" /&gt;"
+" />]]>"
 
 #. Tag: para
 #: basic_mapping.xml:141
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "<literal>schema</literal> (optional): the name of a database schema."
-msgstr "<literal>schema</literal>(可选): 数据库 schema 的名称。"
+msgstr "<literal>schema</literal>(可选):数据库 schema 的名称。"
 
 #. Tag: para
 #: basic_mapping.xml:146
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "<literal>catalog</literal> (optional): the name of a database catalog."
-msgstr "<literal>catalog</literal>(可选):数据库 catalog 的名称。"
+msgstr "<literal>catalog</literal>(可选):数据库 catalog 的名称。 "
 
 #. Tag: para
 #: basic_mapping.xml:151
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>default-cascade</literal> (optional - defaults to <literal>none</"
 "literal>): a default cascade style."
 msgstr ""
 "<literal>default-cascade</literal>(可选 — 默认为 <literal>none</literal>):"
-"默认的级联风格。"
+"默认的级联风格。 "
 
 #. Tag: para
 #: basic_mapping.xml:157
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>default-access</literal> (optional - defaults to <literal>property</"
 "literal>): the strategy Hibernate should use for accessing all properties. "
@@ -410,11 +417,11 @@
 msgstr ""
 "<literal>default-access</literal>(可选 — 默认为 <literal>property</"
 "literal>):Hibernate 用来访问所有属性的策略。可以通过实现 "
-"<literal>PropertyAccessor</literal> 接口自定义。"
+"<literal>PropertyAccessor</literal> 接口自定义。 "
 
 #. Tag: para
 #: basic_mapping.xml:164
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>default-lazy</literal> (optional - defaults to <literal>true</"
 "literal>): the default value for unspecified <literal>lazy</literal> "
@@ -422,32 +429,32 @@
 msgstr ""
 "<literal>default-lazy</literal>(可选 — 默认为 <literal>true</literal>):指"
 "定了未明确注明 <literal>lazy</literal> 属性的 Java 属性和集合类,Hibernate 会"
-"采取什么样的默认加载风格。"
+"采取什么样的默认加载风格。 "
 
 #. Tag: para
 #: basic_mapping.xml:171
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>auto-import</literal> (optional - defaults to <literal>true</"
 "literal>): specifies whether we can use unqualified class names of classes "
 "in this mapping in the query language."
 msgstr ""
 "<literal>auto-import</literal>(可选 — 默认为 <literal>true</literal>):指定"
-"我们是否可以在查询语言中使用非全限定的类名(仅限于本映射文件中的类)。"
+"我们是否可以在查询语言中使用非全限定的类名(仅限于本映射文件中的类)。 "
 
 #. Tag: para
 #: basic_mapping.xml:178
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>package</literal> (optional): specifies a package prefix to use for "
 "unqualified class names in the mapping document."
 msgstr ""
 "<literal>package</literal>(可选):指定一个包前缀,如果在映射文档中没有指定"
-"全限定的类名,就使用这个作为包名。"
+"全限定的类名,就使用这个作为包名。 "
 
 #. Tag: para
 #: basic_mapping.xml:186
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "If you have two persistent classes with the same unqualified name, you "
 "should set <literal>auto-import=\"false\"</literal>. An exception will "
@@ -455,11 +462,11 @@
 msgstr ""
 "假若你有两个持久化类,它们的非全限定名是一样的(就是两个类的名字一样,所在的"
 "包不一样 — 译者注),你应该设置 <literal>auto-import=\"false\"</literal>。如"
-"果你把一个“import 过”的名字同时对应两个类,Hibernate 会抛出一个异常。"
+"果你把一个“导入过”的名字同时对应两个类,Hibernate 会抛出一个异常。"
 
 #. Tag: para
 #: basic_mapping.xml:192
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "The <literal>hibernate-mapping</literal> element allows you to nest several "
 "persistent <literal>&lt;class&gt;</literal> mappings, as shown above. It is, "
@@ -472,26 +479,26 @@
 "注意 <literal>hibernate-mapping</literal> 元素允许你嵌套多个如上所示的 "
 "<literal>&lt;class&gt;</literal> 映射。但是最好的做法(也许一些工具需要的)是"
 "一个持久化类(或一个类的继承层次)对应一个映射文件,并以持久化的超类名称命"
-"名,例如:<literal>Cat.hbm.xml</literal>,<literal>Dog.hbm.xml</literal>,或"
+"名,例如:<literal>Cat.hbm.xml</literal>、<literal>Dog.hbm.xml</literal>,或"
 "者如果使用继承,<literal>Animal.hbm.xml</literal>。"
 
 #. Tag: title
 #: basic_mapping.xml:205
-#, fuzzy, no-c-format
+#, no-c-format
 msgid "Class"
-msgstr "子类(subclass)"
+msgstr "类"
 
 #. Tag: para
 #: basic_mapping.xml:207
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "You can declare a persistent class using the <literal>class</literal> "
 "element. For example:"
-msgstr "你可以使用 <literal>class</literal> 元素来定义一个持久化类:"
+msgstr "你可以使用 <literal>class</literal> 元素来定义一个持久化类。例如:"
 
 #. Tag: programlisting
 #: basic_mapping.xml:235
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<![CDATA[<class\n"
 "        name=\"ClassName\"\n"
@@ -518,7 +525,7 @@
 "        node=\"element-name\"\n"
 "/>]]>"
 msgstr ""
-"&lt;class\n"
+"<![CDATA[<class\n"
 "        name=\"ClassName\"\n"
 "        table=\"tableName\"\n"
 "        discriminator-value=\"discriminator_value\"\n"
@@ -541,31 +548,30 @@
 "        subselect=\"SQL expression\"\n"
 "        abstract=\"true|false\"\n"
 "        node=\"element-name\"\n"
-"/&gt;"
+"/>]]>"
 
 #. Tag: para
 #: basic_mapping.xml:238
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>name</literal> (optional): the fully qualified Java class name of "
 "the persistent class or interface. If this attribute is missing, it is "
 "assumed that the mapping is for a non-POJO entity."
 msgstr ""
 "<literal>name</literal>(可选):持久化类(或者接口)的 Java 全限定名。 如果"
-"这个属性不存在,Hibernate 将假定这是一个非 POJO 的实体映射。"
+"这个属性不存在,Hibernate 将假定这是一个非 POJO 的实体映射。 "
 
 #. Tag: para
 #: basic_mapping.xml:245
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>table</literal> (optional - defaults to the unqualified class "
 "name): the name of its database table."
-msgstr ""
-"<literal>table</literal>(可选 — 默认是类的非全限定名):对应的数据库表名。"
+msgstr "<literal>table</literal>(可选 — 默认是类的非全限定名):对应的数据库表名。 "
 
 #. Tag: para
 #: basic_mapping.xml:251
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>discriminator-value</literal> (optional - defaults to the class "
 "name): a value that distinguishes individual subclasses that is used for "
@@ -574,51 +580,49 @@
 msgstr ""
 "<literal>discriminator-value</literal>(可选 — 默认和类名一样):一个用于区分"
 "不同的子类的值,在多态行为时使用。它可以接受的值包括 <literal>null</literal> "
-"和 <literal>not null</literal>。"
+"和 <literal>not null</literal>。 "
 
 #. Tag: para
 #: basic_mapping.xml:258
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>mutable</literal> (optional - defaults to <literal>true</literal>): "
 "specifies that instances of the class are (not) mutable."
 msgstr ""
 "<literal>mutable</literal>(可选,默认值为 <literal>true</literal>):表明该"
-"类的实例是可变的或者不可变的。"
+"类的实例是可变的或者不可变的。 "
 
 #. Tag: para
 #: basic_mapping.xml:264 basic_mapping.xml:2227
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>schema</literal> (optional): overrides the schema name specified by "
 "the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "<literal>schema</literal>(可选):覆盖在根 <literal>&lt;hibernate-"
-"mapping&gt;</literal> 元素中指定的 schema 名字。"
+"mapping&gt;</literal> 元素中指定的 schema 名字。 "
 
 #. Tag: para
 #: basic_mapping.xml:270 basic_mapping.xml:2233
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>catalog</literal> (optional): overrides the catalog name specified "
 "by the root <literal>&lt;hibernate-mapping&gt;</literal> element."
 msgstr ""
 "<literal>catalog</literal>(可选):覆盖在根 <literal>&lt;hibernate-"
-"mapping&gt;</literal> 元素中指定的 catalog 名字。"
+"mapping&gt;</literal> 元素中指定的 catalog 名字。 "
 
 #. Tag: para
 #: basic_mapping.xml:276
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>proxy</literal> (optional): specifies an interface to use for lazy "
 "initializing proxies. You can specify the name of the class itself."
-msgstr ""
-"<literal>proxy</literal>(可选):指定一个接口,在延迟装载时作为代理使用。 你"
-"可以在这里使用该类自己的名字。"
+msgstr "<literal>proxy</literal>(可选):指定一个接口,在延迟装载时作为代理使用。你可以在这里使用该类自己的名字。 "
 
 #. Tag: para
 #: basic_mapping.xml:282
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>dynamic-update</literal> (optional - defaults to <literal>false</"
 "literal>): specifies that <literal>UPDATE</literal> SQL should be generated "
@@ -626,11 +630,11 @@
 msgstr ""
 "<literal>dynamic-update</literal>(可选,默认为 <literal>false</literal>):"
 "指定用于 <literal>UPDATE</literal> 的 SQL 将会在运行时动态生成,并且只更新那"
-"些改变过的字段。"
+"些改变过的字段。 "
 
 #. Tag: para
 #: basic_mapping.xml:289
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>dynamic-insert</literal> (optional - defaults to <literal>false</"
 "literal>): specifies that <literal>INSERT</literal> SQL should be generated "
@@ -638,11 +642,11 @@
 msgstr ""
 "<literal>dynamic-insert</literal>(可选,默认为 <literal>false</literal>):"
 "指定用于 <literal>INSERT</literal> 的 SQL 将会在运行时动态生成,并且只包含那"
-"些非空值字段。"
+"些非空值字段。 "
 
 #. Tag: para
 #: basic_mapping.xml:296
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>select-before-update</literal> (optional - defaults to "
 "<literal>false</literal>): specifies that Hibernate should <emphasis>never</"
@@ -657,12 +661,11 @@
 "注),否则<emphasis>不会</emphasis>执行 SQL <literal>UPDATE</literal> 操作。"
 "在特定场合(实际上,它只在一个瞬时对象(transient object)关联到一个新的 "
 "session 中时执行的 update() 中生效),这说明 Hibernate 会在 <literal>UPDATE</"
-"literal> 之前执行一次额外的 SQL <literal>SELECT</literal> 操作,来决定是否应"
-"该执行 <literal>UPDATE</literal>。"
+"literal> 之前执行一次额外的 SQL <literal>SELECT</literal> 操作来决定是否确实需要执行 <literal>UPDATE</literal>。"
 
 #. Tag: para
 #: basic_mapping.xml:306
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>polymorphism</literal> (optional - defaults to <literal>implicit</"
 "literal>): determines whether implicit or explicit query polymorphism is "
@@ -670,59 +673,59 @@
 msgstr ""
 "<literal>polymorphism(多态)</literal>(可选,默认值为 <literal>implicit "
 "(隐式)</literal>):界定是隐式还是显式的使用多态查询(这只在 Hibernate 的具"
-"体表继承策略中用到 — 译注)。"
+"体表继承策略中用到 — 译注)。 "
 
 #. Tag: para
 #: basic_mapping.xml:312
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>where</literal> (optional): specifies an arbitrary SQL "
 "<literal>WHERE</literal> condition to be used when retrieving objects of "
 "this class."
 msgstr ""
 "<literal>where</literal>(可选)指定一个附加的 SQL <literal>WHERE</literal> "
-"条件,在抓取这个类的对象时会一直增加这个条件。"
+"条件,在抓取这个类的对象时会一直增加这个条件。 "
 
 #. Tag: para
 #: basic_mapping.xml:318
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>persister</literal> (optional): specifies a custom "
 "<literal>ClassPersister</literal>."
 msgstr ""
 "<literal>persister</literal>(可选):指定一个定制的 "
-"<literal>ClassPersister</literal>。"
+"<literal>ClassPersister</literal>。 "
 
 #. Tag: para
 #: basic_mapping.xml:323
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>batch-size</literal> (optional - defaults to <literal>1</literal>): "
 "specifies a \"batch size\" for fetching instances of this class by "
 "identifier."
 msgstr ""
 "<literal>batch-size</literal>(可选,默认是 <literal>1</literal>)指定一个用"
-"于 根据标识符(identifier)抓取实例时使用的 \"batch size\"(批次抓取数量)。"
+"于 根据标识符(identifier)抓取实例时使用的 \"batch size\"(批次抓取数量)。 "
 
 #. Tag: para
 #: basic_mapping.xml:329
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>optimistic-lock</literal> (optional - defaults to <literal>version</"
 "literal>): determines the optimistic locking strategy."
 msgstr ""
 "<literal>optimistic-lock(乐观锁定)</literal>(可选,默认是 "
-"<literal>version</literal>):决定乐观锁定的策略。"
+"<literal>version</literal>):决定乐观锁定的策略。 "
 
 #. Tag: para
 #: basic_mapping.xml:335
-#, fuzzy, no-c-format
+#, no-c-format
 msgid ""
 "<literal>lazy</literal> (optional): lazy fetching can be disabled by setting "
 "<literal>lazy=\"false\"</literal>."
 msgstr ""
 "<literal>lazy</literal>(可选):通过设置 <literal>lazy=\"false\"</"
-"literal>, 所有的延迟加载(Lazy fetching)功能将被全部禁用(disabled)。"
+"literal>,所有的延迟加载(Lazy fetching)功能将被全部禁用(disabled)。"
 
 #. Tag: para
 #: basic_mapping.xml:341
@@ -911,8 +914,7 @@
 msgid ""
 "If you enable <literal>dynamic-update</literal>, you will have a choice of "
 "optimistic locking strategies:"
-msgstr ""
-"如果你打开了<literal>dynamic-update</literal>,你可以选择几种乐观锁定的策略:"
+msgstr "如果你打开了<literal>dynamic-update</literal>,你可以选择几种乐观锁定的策略:"
 
 #. Tag: para
 #: basic_mapping.xml:441
@@ -1062,15 +1064,13 @@
 #. Tag: para
 #: basic_mapping.xml:508
 #, fuzzy, no-c-format
-msgid ""
-"<literal>name</literal> (optional): the name of the identifier property."
+msgid "<literal>name</literal> (optional): the name of the identifier property."
 msgstr "<literal>name</literal>(可选):标识属性的名字。"
 
 #. Tag: para
 #: basic_mapping.xml:513 basic_mapping.xml:1347
 #, no-c-format
-msgid ""
-"<literal>type</literal> (optional): a name that indicates the Hibernate type."
+msgid "<literal>type</literal> (optional): a name that indicates the Hibernate type."
 msgstr "<literal>type</literal>(可选):一个 Hibernate 类型的名字。"
 
 #. Tag: para
@@ -1606,8 +1606,7 @@
 #. Tag: para
 #: basic_mapping.xml:773
 #, fuzzy, no-c-format
-msgid ""
-"Hibernate does not generate DDL with triggers. It is for legacy schemas only."
+msgid "Hibernate does not generate DDL with triggers. It is for legacy schemas only."
 msgstr "仅仅用于遗留的 schema 中(Hibernate 不能使用触发器生成 DDL)。"
 
 #. Tag: programlisting
@@ -2041,8 +2040,7 @@
 #. Tag: para
 #: basic_mapping.xml:1000
 #, no-c-format
-msgid ""
-"The following attributes are used to specify a mapped composite identifier:"
+msgid "The following attributes are used to specify a mapped composite identifier:"
 msgstr "下面列出的属性是用来指定一个映射式组合标识符的:"
 
 #. Tag: para
@@ -2324,14 +2322,12 @@
 msgid ""
 "<literal>column</literal> (optional - defaults to the property name): the "
 "name of the column holding the version number."
-msgstr ""
-"<literal>column</literal>(可选 — 默认为属性名):指定持有版本号的字段名。"
+msgstr "<literal>column</literal>(可选 — 默认为属性名):指定持有版本号的字段名。"
 
 #. Tag: para
 #: basic_mapping.xml:1163
 #, fuzzy, no-c-format
-msgid ""
-"<literal>name</literal>: the name of a property of the persistent class."
+msgid "<literal>name</literal>: the name of a property of the persistent class."
 msgstr "<literal>name</literal>:持久化类的属性名。"
 
 #. Tag: para
@@ -3016,8 +3012,7 @@
 msgid ""
 "<literal>not-null</literal> (optional): enables the DDL generation of a "
 "nullability constraint for the foreign key columns."
-msgstr ""
-"<literal>not-null</literal>(可选):使用 DDL 为外键字段生成一个非空约束。"
+msgstr "<literal>not-null</literal>(可选):使用 DDL 为外键字段生成一个非空约束。"
 
 #. Tag: para
 #: basic_mapping.xml:1585
@@ -3095,8 +3090,7 @@
 #. Tag: para
 #: basic_mapping.xml:1628
 #, fuzzy, no-c-format
-msgid ""
-"Here is an example of a typical <literal>many-to-one</literal> declaration:"
+msgid "Here is an example of a typical <literal>many-to-one</literal> declaration:"
 msgstr "一个典型的简单 <literal>many-to-one</literal> 定义例子:"
 
 #. Tag: programlisting
@@ -3105,8 +3099,7 @@
 msgid ""
 "<![CDATA[<many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID"
 "\"/>]]>"
-msgstr ""
-"&lt;many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID\"/&gt;"
+msgstr "&lt;many-to-one name=\"product\" class=\"Product\" column=\"PRODUCT_ID\"/&gt;"
 
 #. Tag: para
 #: basic_mapping.xml:1634
@@ -3354,8 +3347,7 @@
 msgid ""
 "<![CDATA[<one-to-one name=\"employee\" class=\"Employee\" constrained=\"true"
 "\"/>]]>"
-msgstr ""
-"&lt;one-to-one name=\"employee\" class=\"Employee\" constrained=\"true\"/&gt;"
+msgstr "&lt;one-to-one name=\"employee\" class=\"Employee\" constrained=\"true\"/&gt;"
 
 #. Tag: para
 #: basic_mapping.xml:1790
@@ -3435,8 +3427,7 @@
 msgid ""
 "This association can be made bidirectional by adding the following to the "
 "<literal>Person</literal> mapping:"
-msgstr ""
-"如果在 <literal>Person</literal> 的映射加入下面几句,这种关联就是双向的:"
+msgstr "如果在 <literal>Person</literal> 的映射加入下面几句,这种关联就是双向的:"
 
 #. Tag: programlisting
 #: basic_mapping.xml:1816
@@ -3874,8 +3865,7 @@
 #. Tag: para
 #: basic_mapping.xml:2046 basic_mapping.xml:2104 basic_mapping.xml:2167
 #, fuzzy, no-c-format
-msgid ""
-"<literal>name</literal>: the fully qualified class name of the subclass."
+msgid "<literal>name</literal>: the fully qualified class name of the subclass."
 msgstr "<literal>name</literal>:子类的全限定名。"
 
 #. Tag: para
@@ -4178,8 +4168,7 @@
 #. Tag: para
 #: basic_mapping.xml:2191
 #, no-c-format
-msgid ""
-"No discriminator column or key column is required for this mapping strategy."
+msgid "No discriminator column or key column is required for this mapping strategy."
 msgstr "这种映射策略不需要指定辨别标志(discriminator)字段。"
 
 #. Tag: title
@@ -4587,8 +4576,7 @@
 #. Tag: para
 #: basic_mapping.xml:2409
 #, fuzzy, no-c-format
-msgid ""
-"<literal>class</literal>: the fully qualified class name of any Java class."
+msgid "<literal>class</literal>: the fully qualified class name of any Java class."
 msgstr "<literal>class</literal>:任何 Java 类的全限定名。"
 
 #. Tag: para
@@ -4862,8 +4850,7 @@
 msgid ""
 "With the exception of collections, all built-in Hibernate types support null "
 "semantics."
-msgstr ""
-"所有的 Hibernate 内建类型,除了 collections 以外,都支持空(null)语义。"
+msgstr "所有的 Hibernate 内建类型,除了 collections 以外,都支持空(null)语义。"
 
 #. Tag: title
 #: basic_mapping.xml:2571
@@ -5300,8 +5287,7 @@
 msgid ""
 "It is also possible to override the parameters supplied in a typedef on a "
 "case-by-case basis by using type parameters on the property mapping."
-msgstr ""
-"也可以根据具体案例通过属性映射中的类型参数覆盖在 typedef 中提供的参数。"
+msgstr "也可以根据具体案例通过属性映射中的类型参数覆盖在 typedef 中提供的参数。"
 
 #. Tag: para
 #: basic_mapping.xml:2792
@@ -5856,8 +5842,7 @@
 msgid ""
 "<literal>always</literal>: the property value is generated both on insert "
 "and on update."
-msgstr ""
-"<literal>always</literal> — 标明此属性值在 insert 和 update 时都会被生成。"
+msgstr "<literal>always</literal> — 标明此属性值在 insert 和 update 时都会被生成。"
 
 #. Tag: title
 #: basic_mapping.xml:2933
@@ -5973,3 +5958,4 @@
 "        &lt;dialect-scope name=\"org.hibernate.dialect.OracleDialect\"/&gt;\n"
 "    &lt;/database-object&gt;\n"
 "&lt;/hibernate-mapping&gt;"
+




More information about the jboss-cvs-commits mailing list